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

Unified Diff: shell/android/ui_application_loader_android.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/ui_application_loader_android.cc
diff --git a/shell/android/ui_application_loader_android.cc b/shell/android/ui_application_loader_android.cc
index 050b5cc44d987c8cc7e5c46cb4b318971f021da6..a9eacffaa2c79e67b3b1e189de56b3d7559a6a4d 100644
--- a/shell/android/ui_application_loader_android.cc
+++ b/shell/android/ui_application_loader_android.cc
@@ -22,15 +22,16 @@ UIApplicationLoader::~UIApplicationLoader() {
base::Unretained(this)));
}
-void UIApplicationLoader::Load(ApplicationManager* manager,
- const GURL& url,
- ShellPtr shell,
- LoadCallback callback) {
- DCHECK(shell);
+void UIApplicationLoader::Load(
+ ApplicationManager* manager,
+ const GURL& url,
+ InterfaceRequest<Application> application_request,
+ LoadCallback callback) {
+ DCHECK(application_request.is_pending());
ui_message_loop_->PostTask(
FROM_HERE,
base::Bind(&UIApplicationLoader::LoadOnUIThread, base::Unretained(this),
- manager, url, base::Passed(&shell)));
+ manager, url, base::Passed(&application_request)));
}
void UIApplicationLoader::OnApplicationError(ApplicationManager* manager,
@@ -40,10 +41,11 @@ void UIApplicationLoader::OnApplicationError(ApplicationManager* manager,
base::Unretained(this), manager, url));
}
-void UIApplicationLoader::LoadOnUIThread(ApplicationManager* manager,
- const GURL& url,
- ShellPtr shell) {
- loader_->Load(manager, url, shell.Pass(), SimpleLoadCallback());
+void UIApplicationLoader::LoadOnUIThread(
+ ApplicationManager* manager,
+ const GURL& url,
+ InterfaceRequest<Application> application_request) {
+ loader_->Load(manager, url, application_request.Pass(), SimpleLoadCallback());
}
void UIApplicationLoader::OnApplicationErrorOnUIThread(

Powered by Google App Engine
This is Rietveld 408576698