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

Unified Diff: ash/shell.cc

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « ash/shell.h ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 167200)
+++ ash/shell.cc (working copy)
@@ -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 @@
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 @@
// 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 @@
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)
« no previous file with comments | « ash/shell.h ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698