components: Move web_contents_delegate_android into web_contents_delegate_android namespace.

BUG=238224
R=joi@chromium.org, joth@chromium.org, thestig@chromium.org

Review URL: https://codereview.chromium.org/16073002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202981 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 16 insertions, 16 deletions

diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
index cdab32b..a47e0de 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
@@ -15,7 +15,7 @@ import org.chromium.ui.ColorPickerDialog;
  * ColorChooserAndroid communicates with the java ColorPickerDialog and the
  * native color_chooser_android.cc
  */
-@JNINamespace("components")
+@JNINamespace("web_contents_delegate_android")
 public class ColorChooserAndroid {
     private final ColorPickerDialog mDialog;
     private final int mNativeColorChooserAndroid;
diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
index 625f02c..ee3c34e 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java
@@ -14,7 +14,7 @@ import org.chromium.content.browser.ContentViewCore;
 /**
  * Java peer of the native class of the same name.
  */
-@JNINamespace("components")
+@JNINamespace("web_contents_delegate_android")
 public class WebContentsDelegateAndroid {
 
     // Equivalent of WebCore::WebConsoleMessage::LevelTip.
diff --git a/components/web_contents_delegate_android/color_chooser_android.cc b/components/web_contents_delegate_android/color_chooser_android.cc
index 2328571..4eb3d03 100644
--- a/components/web_contents_delegate_android/color_chooser_android.cc
+++ b/components/web_contents_delegate_android/color_chooser_android.cc
@@ -9,7 +9,7 @@
 #include "content/public/browser/web_contents_view.h"
 #include "jni/ColorChooserAndroid_jni.h"
 
-namespace components {
+namespace web_contents_delegate_android {
 
 ColorChooserAndroid::ColorChooserAndroid(content::WebContents* web_contents,
                                          SkColor initial_color)
@@ -54,4 +54,4 @@ bool RegisterColorChooserAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace components
+}  // namespace web_contents_delegate_android
diff --git a/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
index e8a6249..8ab3326 100644
--- a/components/web_contents_delegate_android/color_chooser_android.h
+++ b/components/web_contents_delegate_android/color_chooser_android.h
@@ -15,9 +15,9 @@ using base::android::ScopedJavaLocalRef;
 
 namespace content {
 class WebContents;
-}  // namespace content
+}
 
-namespace components {
+namespace web_contents_delegate_android {
 
 // Glues the Java (ColorPickerChooser.java) picker with the native part.
 class ColorChooserAndroid : public content::ColorChooser {
@@ -45,6 +45,6 @@ class ColorChooserAndroid : public content::ColorChooser {
 // Native JNI methods
 bool RegisterColorChooserAndroid(JNIEnv* env);
 
-}  // namespace components
+}  // namespace web_contents_delegate_android
 
 #endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
diff --git a/components/web_contents_delegate_android/component_jni_registrar.cc b/components/web_contents_delegate_android/component_jni_registrar.cc
index ac8b9c3..b5c5e15 100644
--- a/components/web_contents_delegate_android/component_jni_registrar.cc
+++ b/components/web_contents_delegate_android/component_jni_registrar.cc
@@ -9,7 +9,7 @@
 #include "components/web_contents_delegate_android/color_chooser_android.h"
 #include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
-namespace components {
+namespace web_contents_delegate_android {
 
 static base::android::RegistrationMethod kComponentRegisteredMethods[] = {
   { "ColorChooserAndroid", RegisterColorChooserAndroid },
@@ -21,5 +21,5 @@ bool RegisterWebContentsDelegateAndroidJni(JNIEnv* env) {
       kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods));
 }
 
-} // namespace components
+} // namespace web_contents_delegate_android
 
diff --git a/components/web_contents_delegate_android/component_jni_registrar.h b/components/web_contents_delegate_android/component_jni_registrar.h
index 454a3cf..203585d 100644
--- a/components/web_contents_delegate_android/component_jni_registrar.h
+++ b/components/web_contents_delegate_android/component_jni_registrar.h
@@ -7,13 +7,13 @@
 
 #include <jni.h>
 
-namespace components {
+namespace web_contents_delegate_android {
 
 // Register all JNI bindings necessary for the web_contents_delegate_android
 // component.
 bool RegisterWebContentsDelegateAndroidJni(JNIEnv* env);
 
-}  // namespace components
+}  // namespace web_contents_delegate_android
 
 #endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COMPONENT_JNI_REGISTRAR_H_
 
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index 63d8c17..f591de8 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -32,7 +32,7 @@ using content::ColorChooser;
 using content::WebContents;
 using content::WebContentsDelegate;
 
-namespace components {
+namespace web_contents_delegate_android {
 
 WebContentsDelegateAndroid::WebContentsDelegateAndroid(JNIEnv* env, jobject obj)
     : weak_java_delegate_(env, obj) {
@@ -339,4 +339,4 @@ bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace components
+}  // namespace web_contents_delegate_android
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
index a67a67c..68bca15 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -19,9 +19,9 @@ class WebContents;
 class WebContentsDelegate;
 struct NativeWebKeyboardEvent;
 struct OpenURLParams;
-}  // namespace content
+}
 
-namespace components {
+namespace web_contents_delegate_android {
 
 enum WebContentsDelegateLogLevel {
   // Equivalent of WebCore::WebConsoleMessage::LevelDebug.
@@ -107,6 +107,6 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
 
-}  // namespace components
+}  // namespace web_contents_delegate_android
 
 #endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_