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

Unified Diff: shell/android/mojo_main.cc

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/android/mojo_main.h ('k') | shell/android/run_android_application_function.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/android/mojo_main.cc
diff --git a/mojo/shell/android/mojo_main.cc b/shell/android/mojo_main.cc
similarity index 89%
rename from mojo/shell/android/mojo_main.cc
rename to shell/android/mojo_main.cc
index a8afd89f6c19725d4671b79c7b20fd4f1464a877..491b59e8b47cec5695a560ea9b2175fdf85e037b 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/shell/android/mojo_main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/shell/android/mojo_main.h"
+#include "shell/android/mojo_main.h"
#include "base/android/command_line_android.h"
#include "base/android/java_handler_thread.h"
@@ -17,8 +17,8 @@
#include "jni/MojoMain_jni.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/application_manager/application_manager.h"
-#include "mojo/shell/context.h"
-#include "mojo/shell/init.h"
+#include "shell/context.h"
+#include "shell/init.h"
#include "ui/gl/gl_surface_egl.h"
using base::LazyInstance;
@@ -27,13 +27,12 @@ namespace mojo {
namespace {
-LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
+LazyInstance<scoped_ptr<base::MessageLoop>> g_java_message_loop =
LAZY_INSTANCE_INITIALIZER;
-LazyInstance<scoped_ptr<shell::Context> > g_context =
- LAZY_INSTANCE_INITIALIZER;
+LazyInstance<scoped_ptr<shell::Context>> g_context = LAZY_INSTANCE_INITIALIZER;
-LazyInstance<scoped_ptr<base::android::JavaHandlerThread> > g_shell_thread =
+LazyInstance<scoped_ptr<base::android::JavaHandlerThread>> g_shell_thread =
LAZY_INSTANCE_INITIALIZER;
void RunShell(std::vector<GURL> app_urls) {
« no previous file with comments | « shell/android/mojo_main.h ('k') | shell/android/run_android_application_function.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698