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

Unified Diff: ui/aura_shell/shell.h

Issue 8602003: Revert 110637 - Add ShellAcceleratorController that manages global keyboard accelerators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « ui/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/shell.h
===================================================================
--- ui/aura_shell/shell.h (revision 110642)
+++ ui/aura_shell/shell.h (working copy)
@@ -27,7 +27,6 @@
namespace aura_shell {
class Launcher;
-class ShellAcceleratorController;
class ShellDelegate;
namespace internal {
@@ -62,9 +61,6 @@
// Toggles between overview mode and normal mode.
void ToggleOverview();
- ShellAcceleratorController* accelerator_controller() {
- return accelerator_controller_.get();
- }
ShellDelegate* delegate() { return delegate_.get(); }
Launcher* launcher() { return launcher_.get(); }
@@ -85,8 +81,6 @@
base::WeakPtrFactory<Shell> method_factory_;
- scoped_ptr<ShellAcceleratorController> accelerator_controller_;
-
scoped_ptr<ShellDelegate> delegate_;
scoped_ptr<Launcher> launcher_;
« no previous file with comments | « ui/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698