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

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

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/client/default_capture_client.cc ('k') | ui/aura/desktop/desktop_activation_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
===================================================================
--- ui/aura/demo/demo_main.cc (revision 165738)
+++ ui/aura/demo/demo_main.cc (working copy)
@@ -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,10 +102,9 @@
// 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_));
+ new aura::client::DefaultCaptureClient(root_window_));
}
return root_window_;
}
@@ -113,7 +112,7 @@
private:
aura::RootWindow* root_window_;
- scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_;
+ scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
DISALLOW_COPY_AND_ASSIGN(DemoStackingClient);
};
« no previous file with comments | « ui/aura/client/default_capture_client.cc ('k') | ui/aura/desktop/desktop_activation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698