diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
| commit | 39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch) | |
| tree | fd3c3a40714a2b2dae82b2466517969138024d45 /ash/shell.h | |
| parent | 9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff) | |
| download | chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.
Broke gyp
BUG=
Review URL: https://codereview.chromium.org/199263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/ash/shell.h b/ash/shell.h index 67de216..57b9a14 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -63,17 +63,14 @@ namespace views { class NonClientFrameView; class Widget; namespace corewm { -class TooltipController; -} -} - -namespace wm { class CompoundEventFilter; class InputMethodEventFilter; class ShadowController; +class TooltipController; class VisibilityController; class WindowModalityController; } +} namespace ash { @@ -336,10 +333,10 @@ class ASH_EXPORT Shell internal::DisplayManager* display_manager() { return display_manager_.get(); } - ::wm::InputMethodEventFilter* input_method_filter() { + views::corewm::InputMethodEventFilter* input_method_filter() { return input_method_filter_.get(); } - ::wm::CompoundEventFilter* env_filter() { + views::corewm::CompoundEventFilter* env_filter() { return env_filter_.get(); } views::corewm::TooltipController* tooltip_controller() { @@ -381,7 +378,7 @@ class ASH_EXPORT Shell internal::EventTransformationHandler* event_transformation_handler() { return event_transformation_handler_.get(); } - ::wm::CursorManager* cursor_manager() { return &cursor_manager_; } + views::corewm::CursorManager* cursor_manager() { return &cursor_manager_; } ShellDelegate* delegate() { return delegate_.get(); } @@ -489,7 +486,7 @@ class ASH_EXPORT Shell } // Made available for tests. - ::wm::ShadowController* shadow_controller() { + views::corewm::ShadowController* shadow_controller() { return shadow_controller_.get(); } @@ -612,7 +609,7 @@ class ASH_EXPORT Shell aura::Window* scoped_target_root_window_; // The CompoundEventFilter owned by aura::Env object. - scoped_ptr< ::wm::CompoundEventFilter> env_filter_; + scoped_ptr<views::corewm::CompoundEventFilter> env_filter_; std::vector<WindowAndBoundsPair> to_restore_; @@ -639,9 +636,10 @@ class ASH_EXPORT Shell scoped_ptr<internal::DragDropController> drag_drop_controller_; scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; - scoped_ptr< ::wm::ShadowController> shadow_controller_; - scoped_ptr< ::wm::VisibilityController> visibility_controller_; - scoped_ptr< ::wm::WindowModalityController> window_modality_controller_; + scoped_ptr<views::corewm::ShadowController> shadow_controller_; + scoped_ptr<views::corewm::VisibilityController> visibility_controller_; + scoped_ptr<views::corewm::WindowModalityController> + window_modality_controller_; scoped_ptr<views::corewm::TooltipController> tooltip_controller_; scoped_ptr<DesktopBackgroundController> desktop_background_controller_; scoped_ptr<PowerButtonController> power_button_controller_; @@ -683,7 +681,7 @@ class ASH_EXPORT Shell scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; // An event filter that pre-handles all key events to send them to an IME. - scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; + scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; scoped_ptr<internal::DisplayManager> display_manager_; scoped_ptr<base::WeakPtrFactory<internal::DisplayManager> > @@ -725,7 +723,7 @@ class ASH_EXPORT Shell // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a // pointer to vend to test code. AshNativeCursorManager* native_cursor_manager_; - ::wm::CursorManager cursor_manager_; + views::corewm::CursorManager cursor_manager_; ObserverList<ShellObserver> observers_; |