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.h | |
| 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.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 371ea9f..fcc37363 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -64,6 +64,7 @@ class TooltipController; namespace wm { class CompoundEventFilter; class InputMethodEventFilter; +class NestedAcceleratorController; class ShadowController; class VisibilityController; class UserActivityDetector; @@ -106,7 +107,6 @@ class MaximizeModeWindowManager; class MediaDelegate; class MouseCursorEventFilter; class MruWindowTracker; -class NestedDispatcherController; class NewWindowDelegate; class OverlayEventFilter; class PartialMagnificationController; @@ -631,7 +631,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, std::vector<WindowAndBoundsPair> to_restore_; scoped_ptr<UserMetricsRecorder> user_metrics_recorder_; - scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; + scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_; scoped_ptr<AcceleratorController> accelerator_controller_; scoped_ptr<ShellDelegate> delegate_; scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |