trunk/src/ash/accelerators/accelerator_controller.cc - Issue 137893010: Revert 245010 "Inject GPUDataManager support into ash to abstrac..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ash/accelerators/accelerator_controller.cc

Issue 137893010: Revert 245010 "Inject GPUDataManager support into ash to abstrac..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/ash/accelerators/accelerator_controller.cc

===================================================================

--- trunk/src/ash/accelerators/accelerator_controller.cc (revision 245015)

+++ trunk/src/ash/accelerators/accelerator_controller.cc (working copy)

@@ -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 @@

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:

« no previous file with comments | « trunk/src/ash/DEPS ('k') | trunk/src/ash/ash.gyp » ('j') | no next file with comments »