diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 02:40:55 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 02:40:55 +0000 |
| commit | 567c269bb5cf5e1d4e44ce2b79bfd60520cee0a4 (patch) | |
| tree | bf0545ba0c0e799e7e497099a9f457701cb13593 /ash/shell.cc | |
| parent | e7185fea6573185d7996459b0cb49561f8b32bd7 (diff) | |
| download | chromium_src-567c269bb5cf5e1d4e44ce2b79bfd60520cee0a4.zip chromium_src-567c269bb5cf5e1d4e44ce2b79bfd60520cee0a4.tar.gz chromium_src-567c269bb5cf5e1d4e44ce2b79bfd60520cee0a4.tar.bz2 | |
Refactor and move ash independent accelerator handling code in nested loop to ui/wm/core
I also renamed classes to NestedAcceleratorXxx. I felt this is a bit more clearer than NestedDispatcher, especially in ui/wm/core. Please let me know if you disagree or have better suggestion. I'm happy to rename them.
BUG=None
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272740
R=ben@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272995
Review URL: https://codereview.chromium.org/298703007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index b8a69de..8de58b9 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -10,7 +10,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_filter.h" #include "ash/accelerators/focus_manager_factory.h" -#include "ash/accelerators/nested_dispatcher_controller.h" +#include "ash/accelerators/nested_accelerator_delegate.h" #include "ash/accelerometer/accelerometer_controller.h" #include "ash/ash_switches.h" #include "ash/autoclick/autoclick_controller.h" @@ -108,6 +108,7 @@ #include "ui/wm/core/compound_event_filter.h" #include "ui/wm/core/focus_controller.h" #include "ui/wm/core/input_method_event_filter.h" +#include "ui/wm/core/nested_accelerator_controller.h" #include "ui/wm/core/shadow_controller.h" #include "ui/wm/core/user_activity_detector.h" #include "ui/wm/core/visibility_controller.h" @@ -761,7 +762,7 @@ Shell::~Shell() { partial_magnification_controller_.reset(); tooltip_controller_.reset(); event_client_.reset(); - nested_dispatcher_controller_.reset(); + nested_accelerator_controller_.reset(); toplevel_window_event_handler_.reset(); visibility_controller_.reset(); // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be @@ -887,7 +888,8 @@ void Shell::Init(const ShellInitParams& init_params) { cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay()); - nested_dispatcher_controller_.reset(new NestedDispatcherController); + nested_accelerator_controller_.reset( + new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate)); accelerator_controller_.reset(new AcceleratorController); maximize_mode_controller_.reset(new MaximizeModeController()); @@ -1100,9 +1102,9 @@ void Shell::InitRootWindow(aura::Window* root_window) { root_window->AddPreTargetHandler(toplevel_window_event_handler_.get()); root_window->AddPostTargetHandler(toplevel_window_event_handler_.get()); - if (nested_dispatcher_controller_) { + if (nested_accelerator_controller_) { aura::client::SetDispatcherClient(root_window, - nested_dispatcher_controller_.get()); + nested_accelerator_controller_.get()); } } |