Move WebContentsDelegateAndroid to content/components

content/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 "chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "content/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/public/browser/android/content_view_core.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 "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::WebContents;
 
-namespace web_contents_delegate_android {
+namespace content {
 
 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
 // ----------------------------------------------------------------------------
 
 // 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 content::OpenURLParams& params) {

[jam, 2012/11/12 17:24:40]

ditto

[John Knottenbelt, 2012/11/12 18:07:46]

Done.

   const GURL& url = params.url;
   WindowOpenDisposition disposition = params.disposition;
   content::PageTransition transition(
       PageTransitionFromInt(params.transition));
 
   if (!source || (disposition != CURRENT_TAB &&
                   disposition != NEW_FOREGROUND_TAB &&
                   disposition != NEW_BACKGROUND_TAB &&
                   disposition != OFF_THE_RECORD)) {
     NOTIMPLEMENTED();
@@ skipping 222 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 web_contents_delegate_android
+}  // namespace content