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

Unified Diff: services/window_manager/window_manager_api_unittest.cc

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 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: 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 3960874fed01698d1d5db0b75ea8c5ecd91747b6..f2d42151aa335f4d8e2cb9b83b3a19d7c95fdba7 100644
--- a/services/window_manager/window_manager_api_unittest.cc
+++ b/services/window_manager/window_manager_api_unittest.cc
@@ -83,10 +83,11 @@ class TestApplicationLoader : public mojo::ApplicationLoader,
// Overridden from mojo::ApplicationLoader:
void Load(mojo::ApplicationManager* application_manager,
const GURL& url,
- mojo::ShellPtr shell,
+ mojo::InterfaceRequest<mojo::Application> application_request,
LoadCallback callback) override {
- ASSERT_TRUE(shell);
- scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this, shell.Pass()));
+ ASSERT_TRUE(application_request.is_pending());
+ scoped_ptr<ApplicationImpl> app(
+ new ApplicationImpl(this, application_request.Pass()));
apps_.push_back(app.release());
}
void OnApplicationError(mojo::ApplicationManager* application_manager,

Powered by Google App Engine
This is Rietveld 408576698