summaryrefslogtreecommitdiffstats
path: root/content/shell/shell_stacking_client_ash.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 19:11:32 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 19:11:32 +0000
commitcf310c913a3005c47126f4302461b24497e93aa6 (patch)
tree963b056a7bbe585e0373a707e15649f6ab185909 /content/shell/shell_stacking_client_ash.h
parent70320ab2e9379f2f2065c8cb9a9b16360d43a5d4 (diff)
downloadchromium_src-cf310c913a3005c47126f4302461b24497e93aa6.zip
chromium_src-cf310c913a3005c47126f4302461b24497e93aa6.tar.gz
chromium_src-cf310c913a3005c47126f4302461b24497e93aa6.tar.bz2
Revert 165719 - Move aura shared and desktop classes to the views target. Note that the files don't actually move, that'll come later. I'm just moving them from one target to another.
http://crbug.com/158115 R=scottmg@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/11368010 TBR=ben@chromium.org Review URL: https://codereview.chromium.org/11293072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_stacking_client_ash.h')
-rw-r--r--content/shell/shell_stacking_client_ash.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
index da8095f..c059044 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -12,12 +12,10 @@
namespace aura {
class RootWindow;
class Window;
-namespace client {
-class DefaultCaptureClient;
-}
namespace shared {
class CompoundEventFilter;
class InputMethodEventFilter;
+class RootWindowCaptureClient;
}
namespace test {
class TestActivationClient;
@@ -48,7 +46,7 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
// Owned by RootWindow
aura::shared::CompoundEventFilter* root_window_event_filter_;
- scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+ scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_;
scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
scoped_ptr<aura::test::TestActivationClient> test_activation_client_;