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

Unified Diff: mojo/shell/standalone/context.cc

Issue 1722743002: Adds ability for chrome to behave as mojo_runner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to tip of tree Created 4 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: mojo/shell/standalone/context.cc
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc
index a04d25985ea7e7d5ad7197622157ee3ca63c5924..2c49e73f591756513d378fbf76619e0201096917 100644
--- a/mojo/shell/standalone/context.cc
+++ b/mojo/shell/standalone/context.cc
@@ -34,7 +34,6 @@
#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
#include "mojo/shell/application_loader.h"
#include "mojo/shell/connect_params.h"
-#include "mojo/shell/runner/host/command_line_switch.h"
#include "mojo/shell/runner/host/in_process_native_runner.h"
#include "mojo/shell/runner/host/out_of_process_native_runner.h"
#include "mojo/shell/standalone/tracer.h"
@@ -99,7 +98,8 @@ void OnInstanceQuit(const GURL& url, const Identity& identity) {
Context::Context()
: io_thread_(CreateIOThread("io_thread")),
- main_entry_time_(base::Time::Now()) {}
+ main_entry_time_(base::Time::Now()),
+ native_runner_delegate_(nullptr) {}
Context::~Context() {
DCHECK(!base::MessageLoop::current());
@@ -145,7 +145,7 @@ void Context::Init(const base::FilePath& shell_file_root) {
new InProcessNativeRunnerFactory(blocking_pool_.get()));
} else {
runner_factory.reset(new OutOfProcessNativeRunnerFactory(
- blocking_pool_.get(), command_line_switches_));
+ blocking_pool_.get(), native_runner_delegate_));
}
application_manager_.reset(new ApplicationManager(
std::move(runner_factory), blocking_pool_.get(), true));
« chrome/common/BUILD.gn ('K') | « mojo/shell/standalone/context.h ('k') | ui/views/mus/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698