Move direct_manipulation to ui/base/win

This patch is preparing for the new implementation of Direct
Manipulation API. In the patch, we move direct_manipulation.h|cc to
ui/base/win, change related macros, includes and run git cl format.

Bug: 647140
Change-Id: Ib3acccf84737ae6c25be27ad0d2776ab005c5fd3
Reviewed-on: https://chromium-review.googlesource.com/896704Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jianpeng Chao <chaopeng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533805}

content/browser/renderer_host/legacy_render_widget_host_win.cc

@@ -19,11 +19,11 @@
 #include "content/public/common/content_switches.h"
 #include "ui/accessibility/platform/ax_system_caret_win.h"
 #include "ui/base/view_prop.h"
+#include "ui/base/win/direct_manipulation.h"
 #include "ui/base/win/internal_constants.h"
 #include "ui/base/win/window_event_target.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/win/direct_manipulation.h"
 
 namespace content {
 
@@ -140,7 +140,7 @@ bool LegacyRenderWidgetHostHWND::Init() {
   // Direct Manipulation is enabled on Windows 10+. The CreateInstance function
   // returns NULL if Direct Manipulation is not available.
   direct_manipulation_helper_ =
-      gfx::win::DirectManipulationHelper::CreateInstance();
+      ui::win::DirectManipulationHelper::CreateInstance();
   if (direct_manipulation_helper_)
     direct_manipulation_helper_->Initialize(hwnd());
 

content/browser/renderer_host/legacy_render_widget_host_win.h

@@ -17,16 +17,13 @@
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace gfx {
-namespace win {
-class DirectManipulationHelper;
-}  // namespace win
-}  // namespace gfx
-
 namespace ui {
 class AXSystemCaretWin;
 class WindowEventTarget;
-}
+namespace win {
+class DirectManipulationHelper;
+}  // namespace win
+}  // namespace ui
 
 namespace content {
 class RenderWidgetHostViewAura;
@@ -170,7 +167,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
   // This class provides functionality to register the legacy window as a
   // Direct Manipulation consumer. This allows us to support smooth scroll
   // in Chrome on Windows 10.
-  std::unique_ptr<gfx::win::DirectManipulationHelper>
+  std::unique_ptr<ui::win::DirectManipulationHelper>
       direct_manipulation_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(LegacyRenderWidgetHostHWND);

ui/base/BUILD.gn

@@ -291,6 +291,8 @@ component("base") {
     "win/accessibility_misc_utils.cc",
     "win/accessibility_misc_utils.h",
     "win/atl_module.h",
+    "win/direct_manipulation.cc",
+    "win/direct_manipulation.h",
     "win/foreground_helper.cc",
     "win/foreground_helper.h",
     "win/hidden_window.cc",

ui/gfx/win/direct_manipulation.cc → ui/base/win/direct_manipulation.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/win/direct_manipulation.h"
+#include "ui/base/win/direct_manipulation.h"
 
 #include <objbase.h>
 
 #include "base/win/windows_version.h"
 
-namespace gfx {
+namespace ui {
 namespace win {
 
 // static
@@ -17,7 +17,7 @@ DirectManipulationHelper::CreateInstance() {
   // TODO(dtapuska): Do not create a DirectManipulationHelper on any windows
   // versions as it only causes issues. High Precision Touchpad events seem to
   // always be sent to apps with recent Windows 10 versions. This class should
-  // eventually be removed. See crbug.com/647038.
+  // eventually be removed. See https://crbug.com/647038.
   return nullptr;
 }
 
@@ -60,14 +60,14 @@ void DirectManipulationHelper::Initialize(HWND window) {
   // Enable the desired configuration for each viewport.
   //
   DIRECTMANIPULATION_CONFIGURATION configuration =
-      DIRECTMANIPULATION_CONFIGURATION_INTERACTION
-      | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X
-      | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y
-      | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA
-      | DIRECTMANIPULATION_CONFIGURATION_RAILS_X
-      | DIRECTMANIPULATION_CONFIGURATION_RAILS_Y
-      | DIRECTMANIPULATION_CONFIGURATION_SCALING
-      | DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA;
+      DIRECTMANIPULATION_CONFIGURATION_INTERACTION |
+      DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X |
+      DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y |
+      DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA |
+      DIRECTMANIPULATION_CONFIGURATION_RAILS_X |
+      DIRECTMANIPULATION_CONFIGURATION_RAILS_Y |
+      DIRECTMANIPULATION_CONFIGURATION_SCALING |
+      DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA;
 
   hr = view_port_outer_->ActivateConfiguration(configuration);
   CHECK(SUCCEEDED(hr));
@@ -103,9 +103,11 @@ void DirectManipulationHelper::Deactivate(HWND window) {
   manager_->Deactivate(window);
 }
 
-void DirectManipulationHelper:: HandleMouseWheel(HWND window, UINT message,
-    WPARAM w_param, LPARAM l_param) {
-  MSG msg = { window, message, w_param, l_param};
+void DirectManipulationHelper::HandleMouseWheel(HWND window,
+                                                UINT message,
+                                                WPARAM w_param,
+                                                LPARAM l_param) {
+  MSG msg = {window, message, w_param, l_param};
 
   HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS);
   if (SUCCEEDED(hr)) {
@@ -116,4 +118,4 @@ void DirectManipulationHelper:: HandleMouseWheel(HWND window, UINT message,
 }
 
 }  // namespace win.
-}  // namespace gfx.
+}  // namespace ui.

ui/gfx/win/direct_manipulation.h → ui/base/win/direct_manipulation.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_WIN_DIRECT_MANIPULATION_H_
-#define UI_GFX_WIN_DIRECT_MANIPULATION_H_
+#ifndef UI_WIN_DIRECT_MANIPULATION_H_
+#define UI_WIN_DIRECT_MANIPULATION_H_
 
 #include <directmanipulation.h>
 #include <wrl/client.h>
@@ -11,10 +11,10 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/gfx_export.h"
 
-namespace gfx {
+namespace ui {
 namespace win {
 
 // Windows 10 provides a new API called Direct Manipulation which generates
@@ -39,7 +39,7 @@ namespace win {
 // Direct Manipulation consumer. We don't rely on Direct manipulation
 // to do the smooth scrolling in the background thread as documented on
 // msdn.
-class GFX_EXPORT DirectManipulationHelper {
+class UI_BASE_EXPORT DirectManipulationHelper {
  public:
   // Creates an instance of this class if Direct Manipulation is enabled on
   // the platform. If not returns NULL.
@@ -63,8 +63,10 @@ class GFX_EXPORT DirectManipulationHelper {
 
   // Passes the WM_MOUSEWHEEL messages to Direct Manipulation. This is for
   // logistics purposes.
-  void HandleMouseWheel(HWND window, UINT message, WPARAM w_param,
-      LPARAM l_param);
+  void HandleMouseWheel(HWND window,
+                        UINT message,
+                        WPARAM w_param,
+                        LPARAM l_param);
 
   ~DirectManipulationHelper();
 
@@ -81,6 +83,6 @@ class GFX_EXPORT DirectManipulationHelper {
 };
 
 }  // namespace win
-}  // namespace gfx
+}  // namespace ui
 
-#endif  // UI_GFX_WIN_DIRECT_MANIPULATION_H_
+#endif  // UI_WIN_DIRECT_MANIPULATION_H_

ui/gfx/BUILD.gn

@@ -172,8 +172,6 @@ jumbo_component("gfx") {
     "utf16_indexing.h",
     "vsync_provider.cc",
     "vsync_provider.h",
-    "win/direct_manipulation.cc",
-    "win/direct_manipulation.h",
     "win/direct_write.cc",
     "win/direct_write.h",
     "win/hwnd_util.cc",

ui/views/win/hwnd_message_handler.cc

@@ -31,6 +31,7 @@
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/view_prop.h"
+#include "ui/base/win/direct_manipulation.h"
 #include "ui/base/win/internal_constants.h"
 #include "ui/base/win/lock_state.h"
 #include "ui/base/win/mouse_wheel_util.h"
@@ -48,7 +49,6 @@
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/path_win.h"
-#include "ui/gfx/win/direct_manipulation.h"
 #include "ui/gfx/win/hwnd_util.h"
 #include "ui/gfx/win/rendering_window_manager.h"
 #include "ui/native_theme/native_theme_win.h"
@@ -416,7 +416,7 @@ void HWNDMessageHandler::Init(HWND parent, const gfx::Rect& bounds) {
   // Direct Manipulation is enabled on Windows 10+. The CreateInstance function
   // returns NULL if Direct Manipulation is not available.
   direct_manipulation_helper_ =
-      gfx::win::DirectManipulationHelper::CreateInstance();
+      ui::win::DirectManipulationHelper::CreateInstance();
   if (direct_manipulation_helper_)
     direct_manipulation_helper_->Initialize(hwnd());
 

ui/views/win/hwnd_message_handler.h

@@ -34,9 +34,6 @@
 namespace gfx {
 class ImageSkia;
 class Insets;
-namespace win {
-class DirectManipulationHelper;
-}  // namespace win
 }  // namespace gfx
 
 namespace ui  {
@@ -44,7 +41,10 @@ class AXSystemCaretWin;
 class InputMethod;
 class TextInputClient;
 class ViewProp;
-}
+namespace win {
+class DirectManipulationHelper;
+}  // namespace win
+}  // namespace ui
 
 namespace views {
 
@@ -737,7 +737,7 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
   // This class provides functionality to register the legacy window as a
   // Direct Manipulation consumer. This allows us to support smooth scroll
   // in Chrome on Windows 10.
-  std::unique_ptr<gfx::win::DirectManipulationHelper>
+  std::unique_ptr<ui::win::DirectManipulationHelper>
       direct_manipulation_helper_;
 
   // The location where the user clicked on the caption. We cache this when we