diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 23:19:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 23:19:25 +0000 |
| commit | d271ba13087b02f646e6ee94380b20c99700b9b7 (patch) | |
| tree | 1281daa2a269afec3e1bea1506bdbf3fe2442920 /ash/accelerators | |
| parent | fd42d13f3d867284868b66fd89b2ea6fc0829c1f (diff) | |
| download | chromium_src-d271ba13087b02f646e6ee94380b20c99700b9b7.zip chromium_src-d271ba13087b02f646e6ee94380b20c99700b9b7.tar.gz chromium_src-d271ba13087b02f646e6ee94380b20c99700b9b7.tar.bz2 | |
Revert 245010 "Inject GPUDataManager support into ash to abstrac..."
> Inject GPUDataManager support into ash to abstract a content dependency.
>
> http://crbug.com/332504
>
> R=oshima@chromium.org
>
> Review URL: https://codereview.chromium.org/138223004
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/137893010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index b7a51cf..c4e6691 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -18,7 +18,6 @@ #include "ash/display/display_controller.h" #include "ash/display/display_manager.h" #include "ash/focus_cycler.h" -#include "ash/gpu_support.h" #include "ash/ime_control_delegate.h" #include "ash/magnifier/magnification_controller.h" #include "ash/magnifier/partial_magnification_controller.h" @@ -56,6 +55,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/user_metrics.h" +#include "content/public/browser/gpu_data_manager.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" @@ -968,7 +968,7 @@ bool AcceleratorController::PerformAction(int action, case TOUCH_HUD_PROJECTION_TOGGLE: return HandleTouchHudProjectToggle(); case DISABLE_GPU_WATCHDOG: - Shell::GetInstance()->gpu_support()->DisableGpuWatchdog(); + content::GpuDataManager::GetInstance()->DisableGpuWatchdog(); return true; #endif // OS_CHROMEOS case OPEN_FEEDBACK_PAGE: |