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

Unified Diff: shell/android/bootstrap.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/android/bootstrap.cc
diff --git a/shell/android/bootstrap.cc b/shell/android/bootstrap.cc
index e3c74fa1deb2990d8e130158051c4905c8d881e1..7775b29fbc42b57c3a19dea7fc3d1a1cae25ae91 100644
--- a/shell/android/bootstrap.cc
+++ b/shell/android/bootstrap.cc
@@ -8,7 +8,6 @@
#include "jni/Bootstrap_jni.h"
#include "shell/android/run_android_application_function.h"
-namespace mojo {
namespace shell {
void Bootstrap(JNIEnv* env,
@@ -29,13 +28,12 @@ bool RegisterBootstrapJni(JNIEnv* env) {
}
} // namespace shell
-} // namespace mojo
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
base::android::InitVM(vm);
JNIEnv* env = base::android::AttachCurrentThread();
- if (!mojo::shell::RegisterBootstrapJni(env))
+ if (!shell::RegisterBootstrapJni(env))
return -1;
return JNI_VERSION_1_4;

Powered by Google App Engine
This is Rietveld 408576698