diff options
| author | hongbo.min@intel.com <hongbo.min@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 11:23:22 +0000 |
|---|---|---|
| committer | hongbo.min@intel.com <hongbo.min@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 11:23:22 +0000 |
| commit | be2a0acabf2622e63bdb00a2a6ae5ad909fba7e0 (patch) | |
| tree | bcb4e739df30d1e65a923904e1fb585ee7cb3a64 /ui/aura | |
| parent | 150f6e652d32663ea797b75938618ce03d9773ab (diff) | |
| download | chromium_src-be2a0acabf2622e63bdb00a2a6ae5ad909fba7e0.zip chromium_src-be2a0acabf2622e63bdb00a2a6ae5ad909fba7e0.tar.gz chromium_src-be2a0acabf2622e63bdb00a2a6ae5ad909fba7e0.tar.bz2 | |
Set CaptureClient instance for aura_demo and aura_bench
BUG=138400
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10808071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/bench/DEPS | 1 | ||||
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 | ||||
| -rw-r--r-- | ui/aura/demo/DEPS | 3 | ||||
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 8 |
4 files changed, 16 insertions, 0 deletions
diff --git a/ui/aura/bench/DEPS b/ui/aura/bench/DEPS index 5b51f22..f5b134b 100644 --- a/ui/aura/bench/DEPS +++ b/ui/aura/bench/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+third_party/khronos", "+third_party/WebKit/Source/WebKit/chromium/public/platform", + "+ui/aura/shared", ] diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 0430901..045a120 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -15,6 +15,7 @@ #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/single_display_manager.h" +#include "ui/aura/shared/root_window_capture_client.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" @@ -296,6 +297,9 @@ int main(int argc, char** argv) { aura::Env::GetInstance()->SetDisplayManager(manager); scoped_ptr<aura::RootWindow> root_window( aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); + aura::client::SetCaptureClient( + root_window.get(), + new aura::shared::RootWindowCaptureClient(root_window.get())); // add layers ColoredLayer background(SK_ColorRED); diff --git a/ui/aura/demo/DEPS b/ui/aura/demo/DEPS new file mode 100644 index 0000000..527eff6 --- /dev/null +++ b/ui/aura/demo/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+ui/aura/shared", # Demo code can include shared code. +] diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index b1908e8..8c25f40 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -13,6 +13,7 @@ #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/single_display_manager.h" +#include "ui/aura/shared/root_window_capture_client.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" @@ -96,12 +97,19 @@ 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::shared::RootWindowCaptureClient(root_window_)); + } return root_window_; } private: aura::RootWindow* root_window_; + scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_; + DISALLOW_COPY_AND_ASSIGN(DemoStackingClient); }; |