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

Unified Diff: shell/desktop/main.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.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
Index: shell/desktop/main.cc
diff --git a/shell/desktop/main.cc b/shell/desktop/main.cc
index 2fea8835b5fb6ea6826e0d3ddf7ebd2652bab735..dfebb2609ea7f20422958124890b160b48edd849 100644
--- a/shell/desktop/main.cc
+++ b/shell/desktop/main.cc
@@ -107,7 +107,7 @@ int main(int argc, char** argv) {
base::AtExitManager at_exit;
base::CommandLine::Init(argc, argv);
- mojo::shell::InitializeLogging();
+ shell::InitializeLogging();
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
@@ -147,7 +147,7 @@ int main(int argc, char** argv) {
// We want the shell::Context to outlive the MessageLoop so that pipes are all
// gracefully closed / error-out before we try to shut the Context down.
- mojo::shell::Context shell_context;
+ shell::Context shell_context;
{
base::MessageLoop message_loop;
if (!shell_context.Init()) {
@@ -167,8 +167,7 @@ int main(int argc, char** argv) {
ApplyApplicationArgs(&shell_context, argv[i]);
message_loop.PostTask(
- FROM_HERE,
- base::Bind(&mojo::shell::RunCommandLineApps, &shell_context));
+ FROM_HERE, base::Bind(&shell::RunCommandLineApps, &shell_context));
message_loop.Run();
// Must be called before |message_loop| is destroyed.

Powered by Google App Engine
This is Rietveld 408576698