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

Unified Diff: mash/wm/window_manager_apptest.cc

Issue 1478813002: Renames example_wm to mash_wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « mash/wm/BUILD.gn ('k') | mojo/tools/data/apptests » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_apptest.cc
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc
index 515b478b95a00b02ec98517bbde5a1d5cc59c8c9..15584afe5aa69c1e7f2e8901793bc1ae3b53dce6 100644
--- a/mash/wm/window_manager_apptest.cc
+++ b/mash/wm/window_manager_apptest.cc
@@ -22,7 +22,7 @@ class WindowManagerAppTest : public mojo::test::ApplicationTestBase,
protected:
void ConnectToWindowManager(mus::mojom::WindowManagerPtr* window_manager) {
- application_impl()->ConnectToService("mojo:example_wm", window_manager);
+ application_impl()->ConnectToService("mojo:mash_wm", window_manager);
}
mus::Window* OpenWindow(mus::mojom::WindowManager* window_manager) {
@@ -30,6 +30,7 @@ class WindowManagerAppTest : public mojo::test::ApplicationTestBase,
mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
window_tree_client_request = GetProxy(&window_tree_client);
mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;
+ properties.mark_non_null();
window_manager->OpenWindow(window_tree_client.Pass(), properties.Pass());
mus::WindowTreeConnection* connection = mus::WindowTreeConnection::Create(
this, window_tree_client_request.Pass(),
« no previous file with comments | « mash/wm/BUILD.gn ('k') | mojo/tools/data/apptests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698