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

Unified Diff: services/ui/demo/mus_demo_internal.cc

Issue 2622103004: Mus Demo: Demonstrate external window mode (Closed)
Patch Set: Address kylechar's feedback Created 3 years, 10 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
Index: services/ui/demo/mus_demo_internal.cc
diff --git a/services/ui/demo/mus_demo_internal.cc b/services/ui/demo/mus_demo_internal.cc
index 9f5eeaed3a8c281f00ae71d1702e30b7e18153ff..d39c78bda2d9141cafbb9333d1b228b825cd83a9 100644
--- a/services/ui/demo/mus_demo_internal.cc
+++ b/services/ui/demo/mus_demo_internal.cc
@@ -23,12 +23,12 @@ MusDemoInternal::MusDemoInternal() {}
MusDemoInternal::~MusDemoInternal() {}
void MusDemoInternal::OnStartImpl(
- std::unique_ptr<aura::WindowTreeClient>& window_tree_client,
- std::unique_ptr<WindowTreeData>& window_tree_data) {
- window_tree_client = base::MakeUnique<aura::WindowTreeClient>(
- context()->connector(), this, this);
- window_tree_client->ConnectAsWindowManager();
- window_tree_data = base::MakeUnique<WindowTreeData>(kSquareSize);
+ std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
+ std::unique_ptr<WindowTreeData>* window_tree_data) {
+ window_tree_client->reset(
kylechar 2017/02/21 18:51:08 *window_tree_client = base::MakeUnique
fwang 2017/02/21 19:02:21 Done.
+ new aura::WindowTreeClient(context()->connector(), this, this));
+ window_tree_client->get()->ConnectAsWindowManager();
+ window_tree_data->reset(new WindowTreeData(kSquareSize));
}
void MusDemoInternal::SetWindowManagerClient(
« services/ui/demo/mus_demo_external.cc ('K') | « services/ui/demo/mus_demo_internal.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698