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

Unified Diff: components/mus/public/cpp/tests/window_server_test_base.h

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/public/cpp/tests/window_server_test_base.h
diff --git a/components/mus/public/cpp/tests/window_server_test_base.h b/components/mus/public/cpp/tests/window_server_test_base.h
index b46c87195b14e58b2849f677d7a770a3b18417aa..cde211b558e63370287cef9094170029d1aa8c27 100644
--- a/components/mus/public/cpp/tests/window_server_test_base.h
+++ b/components/mus/public/cpp/tests/window_server_test_base.h
@@ -7,8 +7,8 @@
#include "base/memory/scoped_ptr.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
-#include "components/mus/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree_host.mojom.h"
#include "mojo/application/public/cpp/application_delegate.h"
#include "mojo/application/public/cpp/application_test_base.h"
#include "mojo/application/public/cpp/interface_factory.h"
@@ -23,7 +23,7 @@ class WindowServerTestBase
: public mojo::test::ApplicationTestBase,
public mojo::ApplicationDelegate,
public WindowTreeDelegate,
- public mojo::InterfaceFactory<mojo::ViewTreeClient> {
+ public mojo::InterfaceFactory<mojom::WindowTreeClient> {
public:
WindowServerTestBase();
~WindowServerTestBase() override;
@@ -64,16 +64,16 @@ class WindowServerTestBase
void OnEmbed(Window* root) override;
void OnConnectionLost(WindowTreeConnection* connection) override;
- // InterfaceFactory<ViewTreeClient>:
+ // InterfaceFactory<WindowTreeClient>:
void Create(mojo::ApplicationConnection* connection,
- mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
+ mojo::InterfaceRequest<mojom::WindowTreeClient> request) override;
// Used to receive the most recent view tree connection loaded by an embed
// action.
WindowTreeConnection* most_recent_connection_;
private:
- mojo::ViewTreeHostPtr host_;
+ mojom::WindowTreeHostPtr host_;
// The View Manager connection held by the window manager (app running at the
// root view).
« no previous file with comments | « components/mus/public/cpp/output_surface.h ('k') | components/mus/public/cpp/tests/window_server_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698