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

Unified Diff: components/mus/example/wm/window_manager_apptest.cc

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase Created 5 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
Index: components/mus/example/wm/window_manager_apptest.cc
diff --git a/components/mus/example/wm/window_manager_apptest.cc b/components/mus/example/wm/window_manager_apptest.cc
index c11c6f9e854a6756748ced7562ad095f1b39f69e..2e90af3938cd6a727222fe2660aae0519f3dcc40 100644
--- a/components/mus/example/wm/window_manager_apptest.cc
+++ b/components/mus/example/wm/window_manager_apptest.cc
@@ -6,8 +6,8 @@
#include "components/mus/public/cpp/window.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
#include "components/mus/public/interfaces/window_manager.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_test_base.h"
@@ -25,12 +25,12 @@ class WindowManagerAppTest : public mojo::test::ApplicationTestBase,
}
mus::Window* OpenWindow(mus::mojom::WindowManager* window_manager) {
- mojo::ViewTreeClientPtr view_tree_client;
- mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client_request =
- GetProxy(&view_tree_client);
- window_manager->OpenWindow(view_tree_client.Pass());
+ mus::mojom::WindowTreeClientPtr window_tree_client;
+ mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
+ window_tree_client_request = GetProxy(&window_tree_client);
+ window_manager->OpenWindow(window_tree_client.Pass());
mus::WindowTreeConnection* connection = mus::WindowTreeConnection::Create(
- this, view_tree_client_request.Pass(),
+ this, window_tree_client_request.Pass(),
mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED);
return connection->GetRoot();
}
« no previous file with comments | « components/mus/example/wm/window_manager_application.h ('k') | components/mus/example/wm/window_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698