mojo/shell/desktop/mojo_main.cc - Issue 397733003: mojo: kill app_thread before unloading main app library and add tests

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: mojo/shell/desktop/mojo_main.cc

Issue 397733003: mojo: kill app_thread before unloading main app library and add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: also service_manager_unittests Created 6 years, 5 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:

Index: mojo/shell/desktop/mojo_main.cc

diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc

index de2d0d4906eebba2883ffbb21c6c5b0b23316c7f..938b95e85a28de08c766f048090989c5392cf3f4 100644

--- a/mojo/shell/desktop/mojo_main.cc

+++ b/mojo/shell/desktop/mojo_main.cc

@@ -33,8 +33,8 @@ int main(int argc, char** argv) {

const base::CommandLine& command_line =

*base::CommandLine::ForCurrentProcess();

if (command_line.HasSwitch(switches::kOrigin)) {

- shell_context.mojo_url_resolver()->set_origin(

- command_line.GetSwitchValueASCII(switches::kOrigin));

+ shell_context.mojo_url_resolver()->SetBaseURL(

+ GURL(command_line.GetSwitchValueASCII(switches::kOrigin)));

}

std::vector<GURL> app_urls;

« no previous file with comments | « mojo/shell/context.cc ('k') | mojo/shell/in_process_dynamic_service_runner.h » ('j') | no next file with comments »