Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

components/web_contents_delegate_android/color_chooser_android.cc

Index: components/web_contents_delegate_android/color_chooser_android.cc
diff --git a/content/components/web_contents_delegate_android/color_chooser_android.cc b/components/web_contents_delegate_android/color_chooser_android.cc
similarity index 87%
rename from content/components/web_contents_delegate_android/color_chooser_android.cc
rename to components/web_contents_delegate_android/color_chooser_android.cc
index 34ab4f00e80c2d8c9dd2c8ad1602640050d33904..cbc174425820c5d644e61b3e500911c0e42c3787 100644
--- a/content/components/web_contents_delegate_android/color_chooser_android.cc
+++ b/components/web_contents_delegate_android/color_chooser_android.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 "content/components/web_contents_delegate_android/color_chooser_android.h"
+#include "components/web_contents_delegate_android/color_chooser_android.h"
 
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
@@ -10,13 +10,22 @@
 
 namespace content {
 
+content::ColorChooser* content::ColorChooser::Create(

[Jói, 2013/01/10 21:17:13]

No need for content:: prefixes in this line and next two.

[boliu, 2013/01/10 22:35:38]

Done.

+    int identifier, content::WebContents* tab, SkColor initial_color) {
+  return new components::ColorChooserAndroid(identifier, tab, initial_color);
+}
+
+}  // namespace content
+
+namespace components {
+
 ColorChooserAndroid::ColorChooserAndroid(int identifier,
                                          content::WebContents* tab,
                                          SkColor initial_color)
     : ColorChooser::ColorChooser(identifier),
       content::WebContentsObserver(tab) {
   JNIEnv* env = AttachCurrentThread();
-  ContentViewCore* content_view_core = tab->GetContentNativeView();
+  content::ContentViewCore* content_view_core = tab->GetContentNativeView();
   DCHECK(content_view_core);
 
   j_color_chooser_.Reset(Java_ColorChooserAndroid_createColorChooserAndroid(
@@ -47,11 +56,6 @@ void ColorChooserAndroid::OnColorChosen(JNIEnv* env, jobject obj, jint color) {
   web_contents()->DidEndColorChooser(identifier());
 }
 
-content::ColorChooser* content::ColorChooser::Create(
-    int identifier, content::WebContents* tab, SkColor initial_color) {
-  return new ColorChooserAndroid(identifier, tab, initial_color);
-}
-
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
@@ -59,4 +63,4 @@ bool RegisterColorChooserAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace content
+}  // namespace components