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 20:26:46 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 20:26:46 +0000
commit48dea153e61257611ed56ccf0b2d8402e647b1ea (patch)
treefed248e1210c9e6816d8c10c6fa4705fc74d1a86 /content/shell/shell_stacking_client_ash.h
parentc67b8a0ff961757fd9d390757e4c27f7a0536890 (diff)
downloadchromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.zip
chromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.tar.gz
chromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.tar.bz2
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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165719 Review URL: https://codereview.chromium.org/11368010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165740 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, 4 insertions, 2 deletions
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
index c059044..da8095f 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -12,10 +12,12 @@
namespace aura {
class RootWindow;
class Window;
+namespace client {
+class DefaultCaptureClient;
+}
namespace shared {
class CompoundEventFilter;
class InputMethodEventFilter;
-class RootWindowCaptureClient;
}
namespace test {
class TestActivationClient;
@@ -46,7 +48,7 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
// Owned by RootWindow
aura::shared::CompoundEventFilter* root_window_event_filter_;
- scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_;
+ scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
scoped_ptr<aura::test::TestActivationClient> test_activation_client_;