Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1919)

Unified Diff: ash/shell.h

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 652a47fc570fd0e63eab64ec148ab48cfd9a36f8..25e6ddc3ce3c45ad1997c318a1d82ecff84b218d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -76,7 +76,6 @@ class WindowModalityController;
namespace ash {
-class AcceleratorController;
class AcceleratorControllerDelegateAura;
class AshNativeCursorManager;
class AutoclickController;
@@ -286,9 +285,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
bool ShouldSaveDisplaySettings();
#endif
- AcceleratorController* accelerator_controller() {
- return accelerator_controller_.get();
- }
AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
return accelerator_controller_delegate_.get();
}
@@ -560,7 +556,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
std::unique_ptr<AcceleratorControllerDelegateAura>
accelerator_controller_delegate_;
- std::unique_ptr<AcceleratorController> accelerator_controller_;
std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
std::unique_ptr<NewWindowDelegate> new_window_delegate_;
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698