| Index: mojo/shell/android/mojo_main.cc
|
| ===================================================================
|
| --- mojo/shell/android/mojo_main.cc (revision 272151)
|
| +++ mojo/shell/android/mojo_main.cc (working copy)
|
| @@ -38,14 +38,14 @@
|
| LazyInstance<scoped_ptr<mojo::Environment> > g_env =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -} // namspace
|
| +} // namespace
|
|
|
| static void Init(JNIEnv* env, jclass clazz, jobject context) {
|
| base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
|
|
|
| base::android::InitApplicationContext(env, scoped_context);
|
|
|
| - CommandLine::Init(0, 0);
|
| + base::CommandLine::Init(0, 0);
|
| mojo::shell::InitializeLogging();
|
|
|
| g_java_message_loop.Get().reset(new base::MessageLoopForUI);
|
| @@ -71,7 +71,7 @@
|
| std::vector<std::string> argv;
|
| argv.push_back("mojo_shell");
|
| argv.push_back(app_url);
|
| - CommandLine::ForCurrentProcess()->InitFromArgv(argv);
|
| + base::CommandLine::ForCurrentProcess()->InitFromArgv(argv);
|
| }
|
|
|
| g_env.Get().reset(new Environment);
|
|
|