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

Issues Search
    My Issues | Starred     Open | Closed | All

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: review + hack 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/context.cc ('k') | mojo/shell/in_process_dynamic_service_runner.h » ('j') | mojo/shell/in_process_dynamic_service_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | mojo/shell/in_process_dynamic_service_runner.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698