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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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: 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 5d98fa579dcce2516e0a22e02f5d5c95989c81e7..b47ea4c56929af816365cabb9d376ce150594cbf 100644
--- a/components/mus/public/cpp/tests/window_server_test_base.h
+++ b/components/mus/public/cpp/tests/window_server_test_base.h
@@ -24,7 +24,7 @@ class WindowServerTestBase
: public WindowServerShellTestBase,
public WindowTreeDelegate,
public WindowManagerDelegate,
- public mojo::InterfaceFactory<mojom::WindowTreeClient> {
+ public shell::InterfaceFactory<mojom::WindowTreeClient> {
public:
WindowServerTestBase();
~WindowServerTestBase() override;
@@ -62,7 +62,7 @@ class WindowServerTestBase
void SetUp() override;
// WindowServerShellTestBase:
- bool AcceptConnection(mojo::Connection* connection) override;
+ bool AcceptConnection(shell::Connection* connection) override;
// WindowTreeDelegate:
void OnEmbed(Window* root) override;
@@ -79,7 +79,7 @@ class WindowServerTestBase
void OnAccelerator(uint32_t id, const ui::Event& event) override;
// InterfaceFactory<WindowTreeClient>:
- void Create(mojo::Connection* connection,
+ void Create(shell::Connection* connection,
mojo::InterfaceRequest<mojom::WindowTreeClient> request) override;
// Used to receive the most recent window tree connection loaded by an embed

Powered by Google App Engine
This is Rietveld 408576698