diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:57:00 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:57:00 +0000 |
| commit | ac12ae9f32314d329e21b63ebee475e3664996f4 (patch) | |
| tree | bff25594faabca65c7327693f6f4ec7a85cd1105 /ash/accelerators/accelerator_controller.cc | |
| parent | 9ac9a8e9135080026667004525370dd3ad69f9d3 (diff) | |
| download | chromium_src-ac12ae9f32314d329e21b63ebee475e3664996f4.zip chromium_src-ac12ae9f32314d329e21b63ebee475e3664996f4.tar.gz chromium_src-ac12ae9f32314d329e21b63ebee475e3664996f4.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -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 c4e6691..b7a51cf 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -18,6 +18,7 @@ #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" @@ -55,7 +56,6 @@ #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: - content::GpuDataManager::GetInstance()->DisableGpuWatchdog(); + Shell::GetInstance()->gpu_support()->DisableGpuWatchdog(); return true; #endif // OS_CHROMEOS case OPEN_FEEDBACK_PAGE: |