Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

components/web_contents_delegate_android/web_contents_delegate_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/web_contents_delegate_android.h"
+#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "content/components/web_contents_delegate_android/color_chooser_android.h"
 #include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/color_chooser.h"
+#include "content/public/browser/invalidate_type.h"
+#include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "content/public/browser/invalidate_type.h"
-#include "content/public/browser/page_navigator.h"
-#include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
+#include "googleurl/src/gurl.h"
 #include "jni/WebContentsDelegateAndroid_jni.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::HasClass;
 using base::android::ScopedJavaLocalRef;
+using content::ColorChooser;
+using content::WebContents;
+using content::WebContentsDelegate;
 
-namespace content {
+namespace components {
 
 WebContentsDelegateAndroid::WebContentsDelegateAndroid(JNIEnv* env, jobject obj)
     : weak_java_delegate_(env, obj) {
 }
 
 WebContentsDelegateAndroid::~WebContentsDelegateAndroid() {
 }
 
 ScopedJavaLocalRef<jobject>
 WebContentsDelegateAndroid::GetJavaDelegate(JNIEnv* env) const {
   return weak_java_delegate_.get(env);
 }
 
 // ----------------------------------------------------------------------------
 // WebContentsDelegate methods
 // ----------------------------------------------------------------------------
 
 ColorChooser* WebContentsDelegateAndroid::OpenColorChooser(
     WebContents* source,
     int color_chooser_id,
     SkColor color)  {
   return ColorChooser::Create(color_chooser_id, source, color);
 }
 
 // OpenURLFromTab() will be called when we're performing a browser-intiated
 // navigation. The most common scenario for this is opening new tabs (see
 // RenderViewImpl::decidePolicyForNavigation for more details).
 WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
     WebContents* source,
-    const OpenURLParams& params) {
+    const content::OpenURLParams& params) {
   const GURL& url = params.url;
   WindowOpenDisposition disposition = params.disposition;
-  PageTransition transition(
+  content::PageTransition transition(
       PageTransitionFromInt(params.transition));
 
   if (!source || (disposition != CURRENT_TAB &&
                   disposition != NEW_FOREGROUND_TAB &&
                   disposition != NEW_BACKGROUND_TAB &&
                   disposition != OFF_THE_RECORD)) {
     NOTIMPLEMENTED();
     return NULL;
   }
 
@@ skipping 15 matching lines @@
     return NULL;
   }
 
   source->GetController().LoadURL(url, params.referrer, transition,
                                   std::string());
   return source;
 }
 
 void WebContentsDelegateAndroid::NavigationStateChanged(
     const WebContents* source, unsigned changed_flags) {
-  if (changed_flags & INVALIDATE_TYPE_TITLE) {
+  if (changed_flags & content::INVALIDATE_TYPE_TITLE) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
     if (obj.is_null())
       return;
     Java_WebContentsDelegateAndroid_onTitleUpdated(
         env, obj.obj());
   }
 }
 
 void WebContentsDelegateAndroid::AddNewContents(
@@ skipping 123 matching lines @@
     return;
   ScopedJavaLocalRef<jstring> java_url =
       ConvertUTF8ToJavaString(env, source->GetURL().spec());
   Java_WebContentsDelegateAndroid_onUpdateUrl(env,
                                               obj.obj(),
                                               java_url.obj());
 }
 
 void WebContentsDelegateAndroid::HandleKeyboardEvent(
     WebContents* source,
-    const NativeWebKeyboardEvent& event) {
+    const content::NativeWebKeyboardEvent& event) {
   jobject key_event = event.os_event;
   if (key_event) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
     if (obj.is_null())
       return;
     Java_WebContentsDelegateAndroid_handleKeyboardEvent(
         env, obj.obj(), key_event);
   }
 }
 
 bool WebContentsDelegateAndroid::TakeFocus(WebContents* source, bool reverse) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return WebContentsDelegate::TakeFocus(source, reverse);
   return Java_WebContentsDelegateAndroid_takeFocus(
       env, obj.obj(), reverse);
 }
 
 void WebContentsDelegateAndroid::ShowRepostFormWarningDialog(
     WebContents* source) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
   ScopedJavaLocalRef<jobject> content_view_core =
-      ContentViewCore::FromWebContents(source)->GetJavaObject();
+      content::ContentViewCore::FromWebContents(source)->GetJavaObject();
   if (content_view_core.is_null())
     return;
   Java_WebContentsDelegateAndroid_showRepostFormWarningDialog(env, obj.obj(),
       content_view_core.obj());
 }
 
 void WebContentsDelegateAndroid::ToggleFullscreenModeForTab(
     WebContents* web_contents,
     bool enter_fullscreen) {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 21 matching lines @@
 // Register native methods
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   if (!HasClass(env, kWebContentsDelegateAndroidClassPath)) {
     DLOG(ERROR) << "Unable to find class WebContentsDelegateAndroid!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
-}  // namespace content
+}  // namespace components