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

Unified Diff: third_party/mojo/src/mojo/public/cpp/application/application_impl.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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: third_party/mojo/src/mojo/public/cpp/application/application_impl.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
index 46d368def198f5b7ba595a2e59b45c03afd0bbbc..21d44d3cc667a726b742a1664b6f2eb4678ec0a0 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
@@ -52,17 +52,28 @@ class ApplicationDelegate;
//
class ApplicationImpl : public Application {
public:
+ // Does not take ownership of |delegate|, which must remain valid for the
+ // lifetime of ApplicationImpl.
ApplicationImpl(ApplicationDelegate* delegate,
InterfaceRequest<Application> request);
~ApplicationImpl() override;
+ // The Mojo shell. This will return a valid pointer after Initialize() has
+ // been invoked. It will remain valid until UnbindConnections() is invoked or
+ // the ApplicationImpl is destroyed.
Shell* shell() const { return shell_.get(); }
+ const std::string& url() const { return url_; }
+
// Returns any initial configuration arguments, passed by the Shell.
const std::vector<std::string>& args() const { return args_; }
bool HasArg(const std::string& arg) const;
- // Establishes a new connection to an application. Caller does not own.
+ // Requests a new connection to an application. Returns a pointer to the
+ // connection if the connection is permitted by this application's delegate,
+ // or nullptr otherwise. Caller does not take ownership. The pointer remains
+ // valid until an error occurs on the connection with the Shell, or until the
+ // ApplicationImpl is destroyed, whichever occurs first.
ApplicationConnection* ConnectToApplication(const String& application_url);
// Connect to application identified by |application_url| and connect to the
@@ -74,7 +85,9 @@ class ApplicationImpl : public Application {
}
// Application implementation.
- void Initialize(ShellPtr shell, Array<String> args) override;
+ void Initialize(ShellPtr shell,
+ Array<String> args,
+ const mojo::String& url) override;
// Block until the Application is initialized, if it is not already.
void WaitForInitialize();
@@ -113,6 +126,7 @@ class ApplicationImpl : public Application {
Binding<Application> binding_;
ShellPtr shell_;
ShellPtrWatcher* shell_watch_;
+ std::string url_;
std::vector<std::string> args_;
MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);

Powered by Google App Engine
This is Rietveld 408576698