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

Unified Diff: content/shell/shell_stacking_client_ash.h

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/wm/workspace/multi_window_resize_controller.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_stacking_client_ash.h
===================================================================
--- content/shell/shell_stacking_client_ash.h (revision 167200)
+++ content/shell/shell_stacking_client_ash.h (working copy)
@@ -15,10 +15,6 @@
namespace client {
class DefaultCaptureClient;
}
-namespace shared {
-class CompoundEventFilter;
-class InputMethodEventFilter;
-}
namespace test {
class TestActivationClient;
}
@@ -28,6 +24,13 @@
class Rect;
}
+namespace views {
+namespace corewm {
+class CompoundEventFilter;
+class InputMethodEventFilter;
+}
+}
+
namespace content {
// Creates a minimal environment for running the shell. We can't pull in all of
@@ -46,10 +49,10 @@
scoped_ptr<aura::RootWindow> root_window_;
// Owned by RootWindow
- aura::shared::CompoundEventFilter* root_window_event_filter_;
+ views::corewm::CompoundEventFilter* root_window_event_filter_;
scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
- scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
+ scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh);
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698