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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 873453004: Use ShellPtr type in ApplicationLoader instead of untyped handles (Closed) Base URL: git@github.com:domokit/mojo.git@master
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
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | shell/dynamic_application_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/application_manager/shell_impl.cc
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index 0d2b59d260b9e159dcbb27c48208e5344c2689f9..d1af2646c544abac1d02f884ccc802766b4819e9 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -10,20 +10,15 @@
namespace mojo {
-ShellImpl::ShellImpl(ScopedMessagePipeHandle handle,
+ShellImpl::ShellImpl(InterfaceRequest<Shell> shell_request,
ApplicationManager* manager,
const GURL& requested_url,
const GURL& url)
- : ShellImpl(manager, requested_url, url) {
- binding_.Bind(handle.Pass());
-}
-
-ShellImpl::ShellImpl(ShellPtr* ptr,
- ApplicationManager* manager,
- const GURL& requested_url,
- const GURL& url)
- : ShellImpl(manager, requested_url, url) {
- binding_.Bind(ptr);
+ : manager_(manager),
+ requested_url_(requested_url),
+ url_(url),
+ binding_(this, shell_request.Pass()) {
+ binding_.set_error_handler(this);
}
ShellImpl::~ShellImpl() {
@@ -36,16 +31,6 @@ void ShellImpl::ConnectToClient(const GURL& requestor_url,
exposed_services.Pass());
}
-ShellImpl::ShellImpl(ApplicationManager* manager,
- const GURL& requested_url,
- const GURL& url)
- : manager_(manager),
- requested_url_(requested_url),
- url_(url),
- binding_(this) {
- binding_.set_error_handler(this);
-}
-
// Shell implementation:
void ShellImpl::ConnectToApplication(const String& app_url,
InterfaceRequest<ServiceProvider> services,
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | shell/dynamic_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698