| 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);
|
|
|