diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:15:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:15:40 +0000 |
| commit | 4a59e4e9b293138235bbb4a1dc559cb2fb54d481 (patch) | |
| tree | d229b8d6e74b040030ff03825174744915cdcf56 /ash/shell.cc | |
| parent | 9147b761180d25b43e832aad95f31b479aadade6 (diff) | |
| download | chromium_src-4a59e4e9b293138235bbb4a1dc559cb2fb54d481.zip chromium_src-4a59e4e9b293138235bbb4a1dc559cb2fb54d481.tar.gz chromium_src-4a59e4e9b293138235bbb4a1dc559cb2fb54d481.tar.bz2 | |
Move ui\aura\shared to ui\views\corewm
http://crbug.com/158115
TBR=sky@chromium.org,jam@chromium.org
Review URL: https://codereview.chromium.org/11275139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 5fd3306..579bd76 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -72,8 +72,6 @@ #include "ui/aura/focus_manager.h" #include "ui/aura/layout_manager.h" #include "ui/aura/root_window.h" -#include "ui/aura/shared/compound_event_filter.h" -#include "ui/aura/shared/input_method_event_filter.h" #include "ui/aura/ui_controls_aura.h" #include "ui/aura/window.h" #include "ui/compositor/layer.h" @@ -83,6 +81,8 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/ui_controls/ui_controls.h" +#include "ui/views/corewm/compound_event_filter.h" +#include "ui/views/corewm/input_method_event_filter.h" #include "ui/views/focus/focus_manager_factory.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/views/widget/widget.h" @@ -165,7 +165,7 @@ internal::RootWindowLayoutManager* Shell::TestApi::root_window_layout() { return shell_->GetPrimaryRootWindowController()->root_window_layout(); } -aura::shared::InputMethodEventFilter* +views::corewm::InputMethodEventFilter* Shell::TestApi::input_method_event_filter() { return shell_->input_method_filter_.get(); } @@ -388,7 +388,7 @@ void Shell::Init() { // Launcher, and WallPaper could be created by the factory. views::FocusManagerFactory::Install(new AshFocusManagerFactory); - env_filter_.reset(new aura::shared::CompoundEventFilter); + env_filter_.reset(new views::corewm::CompoundEventFilter); AddEnvEventFilter(env_filter_.get()); focus_manager_.reset(new aura::FocusManager); @@ -422,7 +422,7 @@ void Shell::Init() { AddEnvEventFilter(overlay_filter_.get()); AddShellObserver(overlay_filter_.get()); - input_method_filter_.reset(new aura::shared::InputMethodEventFilter()); + input_method_filter_.reset(new views::corewm::InputMethodEventFilter); AddEnvEventFilter(input_method_filter_.get()); #if !defined(OS_MACOSX) |