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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 9224001: Fixes issue with accelerators when a menu is open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes as requested Created 8 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:
View side-by-side diff with in-line comments
Download patch
« ash/accelerators/nested_dispatcher_controller.h ('K') | « ash/shell.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 9328dfae593d1f665018a8c95aa8fcc6555b40ce..d270ad45a3b8f085ee48fd00ab824f8f5a0a3885 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -8,6 +8,7 @@
#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_filter.h"
+#include "ash/accelerators/nested_dispatcher_controller.h"
#include "ash/app_list/app_list.h"
#include "ash/ash_switches.h"
#include "ash/drag_drop/drag_drop_controller.h"
@@ -171,6 +172,7 @@ Shell* Shell::instance_ = NULL;
Shell::Shell(ShellDelegate* delegate)
: ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
+ nested_dispatcher_controller_(new NestedDispatcherController),
accelerator_controller_(new AcceleratorController),
delegate_(delegate),
window_mode_(NORMAL_MODE),
« ash/accelerators/nested_dispatcher_controller.h ('K') | « ash/shell.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698