diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 19:11:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 19:11:32 +0000 |
| commit | cf310c913a3005c47126f4302461b24497e93aa6 (patch) | |
| tree | 963b056a7bbe585e0373a707e15649f6ab185909 /ui/aura/demo | |
| parent | 70320ab2e9379f2f2065c8cb9a9b16360d43a5d4 (diff) | |
| download | chromium_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 'ui/aura/demo')
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index 451affb5..e30b2e4 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -8,10 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "third_party/skia/include/core/SkXfermode.h" -#include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/stacking_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" +#include "ui/aura/shared/root_window_capture_client.h" #include "ui/aura/single_display_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -102,9 +102,10 @@ class DemoStackingClient : public aura::client::StackingClient { // Overridden from aura::client::StackingClient: virtual aura::Window* GetDefaultParent(aura::Window* window, const gfx::Rect& bounds) OVERRIDE { + if (!capture_client_.get()) { capture_client_.reset( - new aura::client::DefaultCaptureClient(root_window_)); + new aura::shared::RootWindowCaptureClient(root_window_)); } return root_window_; } @@ -112,7 +113,7 @@ class DemoStackingClient : public aura::client::StackingClient { private: aura::RootWindow* root_window_; - scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; + scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_; DISALLOW_COPY_AND_ASSIGN(DemoStackingClient); }; |