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

Unified Diff: shell/android/native_viewport_application_loader.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: shell/android/native_viewport_application_loader.cc
diff --git a/shell/android/native_viewport_application_loader.cc b/shell/android/native_viewport_application_loader.cc
index 72996a7bd99797062d603717e2ad44aff2811ebd..6306c805b55c8b307780b08c1cf486193c8c2247 100644
--- a/shell/android/native_viewport_application_loader.cc
+++ b/shell/android/native_viewport_application_loader.cc
@@ -17,12 +17,13 @@ NativeViewportApplicationLoader::NativeViewportApplicationLoader() {
NativeViewportApplicationLoader::~NativeViewportApplicationLoader() {
}
-void NativeViewportApplicationLoader::Load(ApplicationManager* manager,
- const GURL& url,
- ShellPtr shell,
- LoadCallback callback) {
- DCHECK(shell);
- app_.reset(new ApplicationImpl(this, shell.Pass()));
+void NativeViewportApplicationLoader::Load(
+ ApplicationManager* manager,
+ const GURL& url,
+ InterfaceRequest<Application> application_request,
+ LoadCallback callback) {
+ DCHECK(application_request.is_pending());
+ app_.reset(new ApplicationImpl(this, application_request.Pass()));
}
void NativeViewportApplicationLoader::OnApplicationError(

Powered by Google App Engine
This is Rietveld 408576698