WIP - Gutterless resize on Windows

ui/views/cocoa/bridged_native_widget.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/thread_task_runner_handle.h"
-#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
+#include "ui/base/window_resize_helper.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/gfx/mac/nswindow_frame_controls.h"
 #include "ui/gfx/screen.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/cocoa_mouse_capture.h"
 #include "ui/views/cocoa/tooltip_manager_mac.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #import "ui/views/cocoa/widget_owner_nswindow_adapter.h"
@@ skipping 186 matching lines @@
 }
 
 // Returns a task runner for creating a ui::Compositor. This allows compositor
 // tasks to be funneled through ui::WindowResizeHelper's task runner to allow
 // resize operations to coordinate with frames provided by the GPU process.
 scoped_refptr<base::SingleThreadTaskRunner> GetCompositorTaskRunner() {
   // If the WindowResizeHelper's pumpable task runner is set, it means the GPU
   // process is directing messages there, and the compositor can synchronize
   // with it. Otherwise, just use the UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
-      ui::WindowResizeHelperMac::Get()->task_runner();
+      ui::WindowResizeHelper::Get()->task_runner();
   return task_runner ? task_runner : base::ThreadTaskRunnerHandle::Get();
 }
 
 }  // namespace
 
 namespace views {
 
 // static
 gfx::Size BridgedNativeWidget::GetWindowSizeForClientSize(
     NSWindow* window,
@@ skipping 880 matching lines @@
 
 void BridgedNativeWidget::MaybeWaitForFrame(const gfx::Size& size_in_dip) {
   if (!layer()->IsDrawn() || compositor_widget_->HasFrameOfSize(size_in_dip))
     return;
 
   const int kPaintMsgTimeoutMS = 50;
   const base::TimeTicks start_time = base::TimeTicks::Now();
   const base::TimeTicks timeout_time =
       start_time + base::TimeDelta::FromMilliseconds(kPaintMsgTimeoutMS);
 
-  ui::WindowResizeHelperMac* resize_helper = ui::WindowResizeHelperMac::Get();
+  ui::WindowResizeHelper* resize_helper = ui::WindowResizeHelper::Get();
   for (base::TimeTicks now = start_time; now < timeout_time;
        now = base::TimeTicks::Now()) {
     if (!resize_helper->WaitForSingleTaskToRun(timeout_time - now))
       return;  // Timeout.
 
     // Since the UI thread is blocked, the size shouldn't change.
     DCHECK(size_in_dip == GetClientAreaSize());
     if (compositor_widget_->HasFrameOfSize(size_in_dip))
       return;  // Frame arrived.
   }
@@ skipping 33 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views