commit ad08bd043ac803278a782f67f4a14f98396ce83d
author Elliot Glaysher <erg@chromium.org> Tue Jan 20 12:18:28 2015 -0800
committer Elliot Glaysher <erg@chromium.org> Tue Jan 20 12:18:28 2015 -0800
tree b8ed627f6267cf12ea37b3d9c3cb2d87e1d55861
parent 9088674a0dbf9507a7acf028120f97b5b6f4644b

Continue deleting code in ui/.

This moves ui/base/hit_test.h into its one consumer,
services/window_manager/, and moves the only part of cursor.h that is
still used into platform_window.h.

BUG=443439
R=sky@chromium.org

Review URL: https://codereview.chromium.org/860873002

services/window_manager/BUILD.gn

diff --git a/services/window_manager/BUILD.gn b/services/window_manager/BUILD.gn
index 9309721..97c1d6e 100644
--- a/services/window_manager/BUILD.gn
+++ b/services/window_manager/BUILD.gn
@@ -49,7 +49,6 @@
 
   deps = [
     "//base",
-    "//ui/base",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",

services/window_manager/hit_test.h

diff --git a/services/window_manager/hit_test.h b/services/window_manager/hit_test.h
new file mode 100644
index 0000000..93126c5
--- /dev/null
+++ b/services/window_manager/hit_test.h
@@ -0,0 +1,41 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SERVICES_WINDOW_MANAGER_HIT_TEST_H_
+#define SERVICES_WINDOW_MANAGER_HIT_TEST_H_
+
+// Defines the same symbolic names used by the WM_NCHITTEST Notification under
+// win32 (the integer values are not guaranteed to be equivalent). We do this
+// because we have a whole bunch of code that deals with window resizing and
+// such that requires these values.
+enum HitTestCompat {
+  HTNOWHERE = 0,
+  HTBORDER,
+  HTBOTTOM,
+  HTBOTTOMLEFT,
+  HTBOTTOMRIGHT,
+  HTCAPTION,
+  HTCLIENT,
+  HTCLOSE,
+  HTERROR,
+  HTGROWBOX,
+  HTHELP,
+  HTHSCROLL,
+  HTLEFT,
+  HTMENU,
+  HTMAXBUTTON,
+  HTMINBUTTON,
+  HTREDUCE,
+  HTRIGHT,
+  HTSIZE,
+  HTSYSMENU,
+  HTTOP,
+  HTTOPLEFT,
+  HTTOPRIGHT,
+  HTTRANSPARENT,
+  HTVSCROLL,
+  HTZOOM
+};
+
+#endif  // SERVICES_WINDOW_MANAGER_HIT_TEST_H_

services/window_manager/window_manager_app.cc

diff --git a/services/window_manager/window_manager_app.cc b/services/window_manager/window_manager_app.cc
index 56dbbc4..da49468 100644
--- a/services/window_manager/window_manager_app.cc
+++ b/services/window_manager/window_manager_app.cc
@@ -16,11 +16,11 @@
 #include "services/window_manager/capture_controller.h"
 #include "services/window_manager/focus_controller.h"
 #include "services/window_manager/focus_rules.h"
+#include "services/window_manager/hit_test.h"
 #include "services/window_manager/view_event_dispatcher.h"
 #include "services/window_manager/view_target.h"
 #include "services/window_manager/view_targeter.h"
 #include "services/window_manager/window_manager_delegate.h"
-#include "ui/base/hit_test.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 
 using mojo::ApplicationConnection;