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

Unified Diff: ui/aura/test/mus/test_window_tree_client_setup.cc

Issue 2445163002: Make aura work with mus (Closed)
Patch Set: NON_EXPORTED_BASE_CLASS Created 4 years, 2 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/test/mus/test_window_tree_client_setup.h ('k') | ui/aura/test/mus/window_tree_client_private.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/mus/test_window_tree_client_setup.cc
diff --git a/services/ui/public/cpp/tests/test_window_tree_client_setup.cc b/ui/aura/test/mus/test_window_tree_client_setup.cc
similarity index 74%
copy from services/ui/public/cpp/tests/test_window_tree_client_setup.cc
copy to ui/aura/test/mus/test_window_tree_client_setup.cc
index eb3c2ad511466088870ee4523a2250f720dd114b..39aa95e3f582ffa11df40ec84ecfc448b503b275 100644
--- a/services/ui/public/cpp/tests/test_window_tree_client_setup.cc
+++ b/ui/aura/test/mus/test_window_tree_client_setup.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/ui/public/cpp/tests/test_window_tree_client_setup.h"
+#include "ui/aura/test/mus/test_window_tree_client_setup.h"
-#include "services/ui/public/cpp/tests/test_window_tree.h"
-#include "services/ui/public/cpp/tests/window_tree_client_private.h"
-#include "services/ui/public/cpp/window_tree_client.h"
+#include "base/memory/ptr_util.h"
+#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/test/mus/test_window_tree.h"
+#include "ui/aura/test/mus/window_tree_client_private.h"
#include "ui/display/display.h"
-namespace ui {
+namespace aura {
TestWindowTreeClientSetup::TestWindowTreeClientSetup() {}
@@ -44,8 +45,9 @@ void TestWindowTreeClientSetup::CommonInit(
WindowTreeClientDelegate* window_tree_delegate,
WindowManagerDelegate* window_manager_delegate) {
window_tree_.reset(new TestWindowTree);
- window_tree_client_.reset(new WindowTreeClient(
- window_tree_delegate, window_manager_delegate, nullptr));
+ window_tree_client_ = base::MakeUnique<WindowTreeClient>(
+ window_tree_delegate, window_manager_delegate, nullptr);
+ window_tree_->set_client(window_tree_client_.get());
}
-} // namespace ui
+} // namespace aura
« no previous file with comments | « ui/aura/test/mus/test_window_tree_client_setup.h ('k') | ui/aura/test/mus/window_tree_client_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698