Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1921)

Unified Diff: ui/aura/demo/demo_main.cc

Issue 10808071: Set CaptureClient instance for aura_demo and aura_bench (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update their DEPS files Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/demo/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index b1908e89747ef869258c93a367489819221e9c4a..8c25f405c31180e551e3d3967fa4aa832065b93c 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);
};
« no previous file with comments | « ui/aura/demo/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698