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

Unified Diff: shell/application_manager/shell_impl.h

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/application_manager/shell_impl.h
diff --git a/shell/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
index 1226f2a46ebcec4d25b253d76f37ef2078e85380..1748078911256b1a28dfbc49cdfe97c08f27443f 100644
--- a/shell/application_manager/shell_impl.h
+++ b/shell/application_manager/shell_impl.h
@@ -16,18 +16,20 @@ class ApplicationManager;
class ShellImpl : public Shell, public ErrorHandler {
public:
- ShellImpl(InterfaceRequest<Shell> shell_request,
+ ShellImpl(ApplicationPtr application,
ApplicationManager* manager,
const GURL& requested_url,
const GURL& url);
~ShellImpl() override;
+ void InitializeApplication(Array<String> args);
+
void ConnectToClient(const GURL& requestor_url,
InterfaceRequest<ServiceProvider> services,
ServiceProviderPtr exposed_services);
- Application* client() { return binding_.client(); }
+ Application* application() { return application_.get(); }
const GURL& url() const { return url_; }
const GURL& requested_url() const { return requested_url_; }
@@ -43,6 +45,7 @@ class ShellImpl : public Shell, public ErrorHandler {
ApplicationManager* const manager_;
const GURL requested_url_;
const GURL url_;
+ ApplicationPtr application_;
Binding<Shell> binding_;
DISALLOW_COPY_AND_ASSIGN(ShellImpl);

Powered by Google App Engine
This is Rietveld 408576698