diff options
| author | ben <ben@chromium.org> | 2016-02-16 13:55:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 21:56:44 +0000 |
| commit | 6f83e7378adef1b0dbc759a941045403f8e6e80b (patch) | |
| tree | cc8b77e9bd18e82a40319f609403ab4d687f68cb /mojo/shell/standalone | |
| parent | 9b7f3d2669f4f99eb8c56c48cbb55f3ac12183b1 (diff) | |
| download | chromium_src-6f83e7378adef1b0dbc759a941045403f8e6e80b.zip chromium_src-6f83e7378adef1b0dbc759a941045403f8e6e80b.tar.gz chromium_src-6f83e7378adef1b0dbc759a941045403f8e6e80b.tar.bz2 | |
Teach ApplicationManager how to use the remote package manager.
Behind a flag --use-remote-package-manager.
This looks pretty ugly right now, because of the different mechanisms by which data is shuffled around between the local & remote package managers and the application manager.
Some TODOs for future CLs:
- make it so pretty names are obtained from the package manager directly rather than via application manager. this avoids some races through the AM/PM relationship
R=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1698173003
Cr-Commit-Position: refs/heads/master@{#375672}
Diffstat (limited to 'mojo/shell/standalone')
| -rw-r--r-- | mojo/shell/standalone/context.cc | 2 | ||||
| -rw-r--r-- | mojo/shell/standalone/desktop/launcher_process.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index acccfd7..b6186bb 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -177,7 +177,7 @@ void Context::Init(const base::FilePath& shell_file_root) { RegisterLocalAliases(package_manager_); scoped_ptr<NativeRunnerFactory> runner_factory; - if (command_line.HasSwitch(switches::kMojoSingleProcess)) { + if (command_line.HasSwitch(switches::kSingleProcess)) { #if defined(COMPONENT_BUILD) LOG(ERROR) << "Running Mojo in single process component build, which isn't " << "supported because statics in apps interact. Use static build" diff --git a/mojo/shell/standalone/desktop/launcher_process.cc b/mojo/shell/standalone/desktop/launcher_process.cc index 9778098..56de7a9 100644 --- a/mojo/shell/standalone/desktop/launcher_process.cc +++ b/mojo/shell/standalone/desktop/launcher_process.cc @@ -31,7 +31,7 @@ int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) { #endif base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // http://crbug.com/546644 - command_line->AppendSwitch(switches::kMojoNoSandbox); + command_line->AppendSwitch(switches::kNoSandbox); base::PlatformThread::SetName("mojo_runner"); |