| Index: ui/views/cocoa/bridged_native_widget.mm
|
| diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
|
| index b91f5b4b2d330a305cbb8ef482eebbe8efa5134e..e53e0b6ff57e54a37123c6cf5a3a5697d337f31e 100644
|
| --- a/ui/views/cocoa/bridged_native_widget.mm
|
| +++ b/ui/views/cocoa/bridged_native_widget.mm
|
| @@ -11,11 +11,11 @@
|
| #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"
|
| @@ -222,7 +222,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetCompositorTaskRunner() {
|
| // 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();
|
| }
|
|
|
| @@ -1123,7 +1123,7 @@ void BridgedNativeWidget::MaybeWaitForFrame(const gfx::Size& size_in_dip) {
|
| 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))
|
|
|