| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index c4e6691d1b6eaabf4d2aa2f2ffdd054a2c1b656e..b7a51cfb50a6a5ea6b9fa8f107c11f879a592fe9 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:
|
|
|