Move WebContentsDelegateAndroid to content/components

content/components/web_contents_delegate_android/web_contents_delegate_android.h

 // 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.
 
 #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_
 
 #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"
 
 namespace content {
 class JavaScriptDialogCreator;
 class RenderViewHost;
 class WebContents;
 class WebContentsObserver;
 struct NativeWebKeyboardEvent;
-}
-
-namespace web_contents_delegate_android {
 
 enum WebContentsDelegateLogLevel {
   // Equivalent of WebCore::WebConsoleMessage::LevelTip.
   WEB_CONTENTS_DELEGATE_LOG_LEVEL_TIP = 0,
   // Equivalent of WebCore::WebConsoleMessage::LevelLog.
   WEB_CONTENTS_DELEGATE_LOG_LEVEL_LOG = 1,
   // Equivalent of WebCore::WebConsoleMessage::LevelWarning.
   WEB_CONTENTS_DELEGATE_LOG_LEVEL_WARNING = 2,
   // Equivalent of WebCore::WebConsoleMessage::LevelError.
   WEB_CONTENTS_DELEGATE_LOG_LEVEL_ERROR = 3,
 };
 
 
 // Native underpinnings of WebContentsDelegateAndroid.java. Provides a default
 // 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 content::WebContentsDelegate {

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

nit: get rid of content:: everywhere

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

Done.

  public:
   WebContentsDelegateAndroid(JNIEnv* env, jobject obj);
   virtual ~WebContentsDelegateAndroid();
 
   // Binds this WebContentsDelegateAndroid to the passed WebContents instance,
   // such that when that WebContents is destroyed, this
   // WebContentsDelegateAndroid instance will be destroyed too.
   void SetOwnerWebContents(content::WebContents* contents);
 
   // Overridden from WebContentsDelegate:
@@ skipping 41 matching lines @@
 
  private:
   // We depend on the java side user of WebContentDelegateAndroid to hold a
   // strong reference to that object as long as they want to receive callbacks
   // on it. Using a weak ref here allows it to be correctly GCed.
   JavaObjectWeakGlobalRef weak_java_delegate_;
 };
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
 
-}  // namespace web_contents_delegate_android
+}  // namespace content
 
 #endif  // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_