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

Unified Diff: services/shell/background/background_shell_main.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
Index: services/shell/background/background_shell_main.cc
diff --git a/services/shell/background/background_shell_main.cc b/services/shell/background/background_shell_main.cc
index 472f012ef0af21883e41d8339a7d71fe792cdea3..e8d7b21c32f897acaaf254cf7eacb4b234b846c1 100644
--- a/services/shell/background/background_shell_main.cc
+++ b/services/shell/background/background_shell_main.cc
@@ -12,7 +12,6 @@
#include "services/shell/runner/host/child_process.h"
#include "services/shell/runner/init.h"
-namespace mojo {
namespace shell {
namespace {
@@ -28,13 +27,12 @@ int RunChildProcess() {
} // namespace
} // namespace shell
-} // namespace mojo
int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kChildProcess)) {
- return mojo::shell::RunChildProcess();
+ return shell::RunChildProcess();
}
// Reset CommandLine as most likely main() is going to use CommandLine too
// and expect to be able to initialize it.
« no previous file with comments | « services/shell/background/background_shell.cc ('k') | services/shell/background/tests/background_shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698