Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

components/web_contents_delegate_android/web_contents_delegate_android.h

Index: components/web_contents_delegate_android/web_contents_delegate_android.h
diff --git a/content/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
similarity index 64%
rename from content/components/web_contents_delegate_android/web_contents_delegate_android.h
rename to components/web_contents_delegate_android/web_contents_delegate_android.h
index 74291e33a22d5d0433c75a3acfeaaa4af64c478e..030195c31ed1385c018295a6ce7793d76a4fcc83 100644
--- a/content/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -2,27 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
-#define CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
 
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/javascript_message_type.h"
-#include "content/public/common/referrer.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/net_errors.h"
+
+class GURL;
 
 namespace content {
-class JavaScriptDialogCreator;
-class RenderViewHost;
 class WebContents;
-class WebContentsObserver;
+class WebContentsDelegate;
 struct NativeWebKeyboardEvent;
+struct OpenURLParams;
+}  // namespace content
+
+namespace components {
 
 enum WebContentsDelegateLogLevel {
   // Equivalent of WebCore::WebConsoleMessage::LevelTip.
@@ -40,7 +38,7 @@ enum WebContentsDelegateLogLevel {
 // delegate for WebContents to forward calls to the java peer. The embedding
 // application may subclass and override methods on either the C++ or Java side
 // as required.
-class WebContentsDelegateAndroid : public WebContentsDelegate {
+class WebContentsDelegateAndroid : public content::WebContentsDelegate {
  public:
   WebContentsDelegateAndroid(JNIEnv* env, jobject obj);
   virtual ~WebContentsDelegateAndroid();
@@ -48,46 +46,47 @@ class WebContentsDelegateAndroid : public WebContentsDelegate {
   // Binds this WebContentsDelegateAndroid to the passed WebContents instance,
   // such that when that WebContents is destroyed, this
   // WebContentsDelegateAndroid instance will be destroyed too.
-  void SetOwnerWebContents(WebContents* contents);
+  void SetOwnerWebContents(content::WebContents* contents);
 
   // Overridden from WebContentsDelegate:
-  virtual WebContents* OpenURLFromTab(
-      WebContents* source,
-      const OpenURLParams& params) OVERRIDE;
+  virtual content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) OVERRIDE;
 
   virtual content::ColorChooser* OpenColorChooser(
       content::WebContents* source, int color_chooser_id,
       SkColor color) OVERRIDE;
-  virtual void NavigationStateChanged(const WebContents* source,
+  virtual void NavigationStateChanged(const content::WebContents* source,
                                       unsigned changed_flags) OVERRIDE;
-  virtual void AddNewContents(WebContents* source,
-                              WebContents* new_contents,
+  virtual void AddNewContents(content::WebContents* source,
+                              content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
-  virtual void ActivateContents(WebContents* contents) OVERRIDE;
-  virtual void DeactivateContents(WebContents* contents) OVERRIDE;
-  virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
-  virtual void LoadProgressChanged(WebContents* source,
+  virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
+  virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
+  virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
+  virtual void LoadProgressChanged(content::WebContents* source,
                                    double load_progress) OVERRIDE;
-  virtual void CloseContents(WebContents* source) OVERRIDE;
-  virtual void MoveContents(WebContents* source,
+  virtual void CloseContents(content::WebContents* source) OVERRIDE;
+  virtual void MoveContents(content::WebContents* source,
                             const gfx::Rect& pos) OVERRIDE;
-  virtual bool AddMessageToConsole(WebContents* source,
+  virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
                                    const string16& message,
                                    int32 line_no,
                                    const string16& source_id) OVERRIDE;
-  virtual void UpdateTargetURL(WebContents* source,
+  virtual void UpdateTargetURL(content::WebContents* source,
                                int32 page_id,
                                const GURL& url) OVERRIDE;
   virtual void HandleKeyboardEvent(
-      WebContents* source,
-      const NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual bool TakeFocus(WebContents* source, bool reverse) OVERRIDE;
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) OVERRIDE;
+  virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
 
-  virtual void ShowRepostFormWarningDialog(WebContents* source) OVERRIDE;
+  virtual void ShowRepostFormWarningDialog(
+      content::WebContents* source) OVERRIDE;
 
   virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
                                           bool enter_fullscreen) OVERRIDE;
@@ -106,6 +105,6 @@ class WebContentsDelegateAndroid : public WebContentsDelegate {
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
 
-}  // namespace content
+}  // namespace components
 
-#endif  // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_