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

Unified Diff: mojo/runner/context.cc

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 8 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/runner/context.h ('k') | mojo/runner/data_pipe_peek_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/context.cc
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 4d8dcd9aa5feae95f555ad753f273861b7163e21..9f96cda1d2e1aaebf5cf8301b50278c5f4d16778 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -36,7 +36,7 @@
#include "url/gurl.h"
namespace mojo {
-namespace shell {
+namespace runner {
namespace {
// Used to ensure we only init once.
@@ -103,7 +103,7 @@ bool ConfigureURLMappings(const base::CommandLine& command_line,
return true;
}
-void InitContentHandlers(ApplicationManager* manager,
+void InitContentHandlers(shell::ApplicationManager* manager,
const base::CommandLine& command_line) {
// Default content handlers.
manager->RegisterContentHandler("application/pdf", GURL("mojo:pdf_viewer"));
@@ -150,7 +150,7 @@ void InitContentHandlers(ApplicationManager* manager,
}
}
-void InitNativeOptions(ApplicationManager* manager,
+void InitNativeOptions(shell::ApplicationManager* manager,
const base::CommandLine& command_line) {
std::vector<std::string> force_in_process_url_list;
base::SplitString(command_line.GetSwitchValueASCII(switches::kForceInProcess),
@@ -163,7 +163,7 @@ void InitNativeOptions(ApplicationManager* manager,
return;
}
- NativeRunnerFactory::Options options;
+ shell::NativeRunnerFactory::Options options;
options.force_in_process = true;
manager->SetNativeOptionsForURL(options, gurl);
}
@@ -255,7 +255,7 @@ bool Context::Init() {
embedder::ProcessType::NONE, task_runners_->shell_runner(), this,
task_runners_->io_runner(), embedder::ScopedPlatformHandle());
- scoped_ptr<NativeRunnerFactory> runner_factory;
+ scoped_ptr<shell::NativeRunnerFactory> runner_factory;
if (command_line.HasSwitch(switches::kEnableMultiprocess))
runner_factory.reset(new OutOfProcessNativeRunnerFactory(this));
else
@@ -322,5 +322,5 @@ void Context::OnApplicationEnd(const GURL& url) {
}
}
-} // namespace shell
+} // namespace runner
} // namespace mojo
« no previous file with comments | « mojo/runner/context.h ('k') | mojo/runner/data_pipe_peek_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698