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

Unified Diff: shell/context.cc

Issue 981733002: Rename {In,OutOf}ProcessDynamicServiceRunner -> ...NativeRunner. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: remove incorrect/flaky NOTREACHED() 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 | « shell/app_child_process_host.cc ('k') | shell/dynamic_service_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index 8b3c076def87dfe2876760874354da984462a7fb..fda814201e392e45fa7f236d35f96aeb507e3dd9 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -32,8 +32,8 @@
#include "shell/command_line_util.h"
#include "shell/external_application_listener.h"
#include "shell/filename_util.h"
-#include "shell/in_process_dynamic_service_runner.h"
-#include "shell/out_of_process_dynamic_service_runner.h"
+#include "shell/in_process_native_runner.h"
+#include "shell/out_of_process_native_runner.h"
#include "shell/switches.h"
#include "url/gurl.h"
@@ -45,8 +45,7 @@ namespace {
class Setup {
public:
Setup() {
- embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
- new mojo::embedder::SimplePlatformSupport()));
+ embedder::Init(make_scoped_ptr(new embedder::SimplePlatformSupport()));
}
~Setup() {}
@@ -180,7 +179,7 @@ class TracingServiceProvider : public ServiceProvider {
: binding_(this, request.Pass()) {}
~TracingServiceProvider() override {}
- void ConnectToService(const mojo::String& service_name,
+ void ConnectToService(const String& service_name,
ScopedMessagePipeHandle client_handle) override {
if (service_name == tracing::TraceController::Name_) {
new TraceControllerImpl(
@@ -277,9 +276,9 @@ bool Context::Init() {
scoped_ptr<NativeRunnerFactory> runner_factory;
if (command_line.HasSwitch(switches::kEnableMultiprocess))
- runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory(this));
+ runner_factory.reset(new OutOfProcessNativeRunnerFactory(this));
else
- runner_factory.reset(new InProcessDynamicServiceRunnerFactory(this));
+ runner_factory.reset(new InProcessNativeRunnerFactory(this));
application_manager_.set_blocking_pool(task_runners_->blocking_pool());
application_manager_.set_native_runner_factory(runner_factory.Pass());
application_manager_.set_disable_cache(
« no previous file with comments | « shell/app_child_process_host.cc ('k') | shell/dynamic_service_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698