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

Unified Diff: services/window_manager/window_manager_api_unittest.cc

Issue 972433004: Use the mojo::shell namespace consistently underly shell/. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Java! Created 5 years, 10 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
« no previous file with comments | « no previous file | shell/android/android_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/window_manager_api_unittest.cc
diff --git a/services/window_manager/window_manager_api_unittest.cc b/services/window_manager/window_manager_api_unittest.cc
index 8b6a5d6dcccd550150ba7b935fa8714c3064ac9d..d1557bb717be66d02e5d88e5d7208264373be2c9 100644
--- a/services/window_manager/window_manager_api_unittest.cc
+++ b/services/window_manager/window_manager_api_unittest.cc
@@ -67,7 +67,7 @@ class TestWindowManagerObserver : public mojo::WindowManagerObserver {
DISALLOW_COPY_AND_ASSIGN(TestWindowManagerObserver);
};
-class TestApplicationLoader : public mojo::ApplicationLoader,
+class TestApplicationLoader : public mojo::shell::ApplicationLoader,
public mojo::ApplicationDelegate,
public mojo::ViewManagerDelegate {
public:
@@ -78,7 +78,7 @@ class TestApplicationLoader : public mojo::ApplicationLoader,
~TestApplicationLoader() override {}
private:
- // Overridden from mojo::ApplicationLoader:
+ // Overridden from mojo::shell::ApplicationLoader:
void Load(
const GURL& url,
mojo::InterfaceRequest<mojo::Application> application_request) override {
@@ -178,7 +178,7 @@ class WindowManagerApiTest : public testing::Test {
test_helper_->AddURLMapping(GURL("mojo:window_manager"),
GURL("mojo:core_window_manager"));
test_helper_->SetLoaderForURL(
- scoped_ptr<mojo::ApplicationLoader>(
+ scoped_ptr<mojo::shell::ApplicationLoader>(
new TestApplicationLoader(base::Bind(
&WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
GURL(kTestServiceURL));
« no previous file with comments | « no previous file | shell/android/android_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698