third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h ('k') | third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc

diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc

index c66dbb50a343fc86c3ca43020222669b1c736623..1fbfcac69af6decc5266f57d30bbe0b752577277 100644

--- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc

+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc

@@ -71,10 +71,13 @@ ApplicationConnection* ApplicationImpl::ConnectToApplication(

return registry;

}

-void ApplicationImpl::Initialize(ShellPtr shell, Array<String> args) {

+void ApplicationImpl::Initialize(ShellPtr shell,

+ Array<String> args,

+ const mojo::String& url) {

shell_ = shell.Pass();

shell_watch_ = new ShellPtrWatcher(this);

shell_.set_error_handler(shell_watch_);

+ url_ = url;

args_ = args.To<std::vector<std::string>>();

delegate_->Initialize(this);

}