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

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

Issue 2843193002: chromeos: fix focus for mushrome (Closed)
Patch Set: cleanup Created 3 years, 8 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: ui/aura/test/mus/test_window_tree_client_setup.cc
diff --git a/ui/aura/test/mus/test_window_tree_client_setup.cc b/ui/aura/test/mus/test_window_tree_client_setup.cc
index e5f62ed3b97f3bc7bbc1f4bef59cd61adf26fd33..65941b2714d8e99a65dcdf56f37d6a291da95b61 100644
--- a/ui/aura/test/mus/test_window_tree_client_setup.cc
+++ b/ui/aura/test/mus/test_window_tree_client_setup.cc
@@ -6,6 +6,7 @@
#include "base/memory/ptr_util.h"
#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/test/mus/test_window_manager_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"
@@ -26,9 +27,11 @@ void TestWindowTreeClientSetup::Init(
void TestWindowTreeClientSetup::InitForWindowManager(
WindowTreeClientDelegate* window_tree_delegate,
WindowManagerDelegate* window_manager_delegate) {
+ test_window_manager_client_ = base::MakeUnique<TestWindowManagerClient>();
CommonInit(window_tree_delegate, window_manager_delegate);
- WindowTreeClientPrivate(window_tree_client_.get())
- .SetTreeAndClientId(window_tree_.get(), 1);
+ WindowTreeClientPrivate wtc_private(window_tree_client_.get());
msw 2017/04/26 23:01:09 optional nit: avoid acronyms
sky 2017/04/26 23:30:28 Ya, I thought the name was rather long and went wi
+ wtc_private.SetTreeAndClientId(window_tree_.get(), 1);
+ wtc_private.SetWindowManagerClient(test_window_manager_client_.get());
}
std::unique_ptr<WindowTreeClient>

Powered by Google App Engine
This is Rietveld 408576698