diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:26:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:26:46 +0000 |
| commit | 48dea153e61257611ed56ccf0b2d8402e647b1ea (patch) | |
| tree | fed248e1210c9e6816d8c10c6fa4705fc74d1a86 /content/shell/shell_stacking_client_ash.cc | |
| parent | c67b8a0ff961757fd9d390757e4c27f7a0536890 (diff) | |
| download | chromium_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.cc')
| -rw-r--r-- | content/shell/shell_stacking_client_ash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/shell_stacking_client_ash.cc b/content/shell/shell_stacking_client_ash.cc index 2890270..5e3fc8a 100644 --- a/content/shell/shell_stacking_client_ash.cc +++ b/content/shell/shell_stacking_client_ash.cc @@ -4,11 +4,11 @@ #include "content/shell/shell_stacking_client_ash.h" +#include "ui/aura/client/default_capture_client.h" #include "ui/aura/focus_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/shared/root_window_capture_client.h" #include "ui/aura/test/test_activation_client.h" namespace content { @@ -48,7 +48,7 @@ aura::Window* ShellStackingClientAsh::GetDefaultParent( new aura::test::TestActivationClient(root_window_.get())); capture_client_.reset( - new aura::shared::RootWindowCaptureClient(root_window_.get())); + new aura::client::DefaultCaptureClient(root_window_.get())); } return root_window_.get(); } |