Removing ContentView dependencies for few functions which acts as WebContents wrapper.

content/browser/web_contents/web_contents_android.h

 // Copyright 2013 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/supports_user_data.h"
 #include "content/browser/frame_host/navigation_controller_android.h"
+#include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/common/content_export.h"
 
+using base::android::ScopedJavaLocalRef;

[Yaron, 2014/07/15 21:23:48]

Don't add this to header

[AKVT, 2014/07/16 09:53:47]

Done.

+
 namespace content {
 
 class WebContents;
 
 // Android wrapper around WebContents that provides safer passage from java and
 // back to native and provides java with a means of communicating with its
 // native counterpart.
 class CONTENT_EXPORT WebContentsAndroid
     : public base::SupportsUserData::Data {
  public:
   static bool Register(JNIEnv* env);
 
   explicit WebContentsAndroid(WebContents* web_contents);
   virtual ~WebContentsAndroid();
 
   WebContents* web_contents() const { return web_contents_; }
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
   // Methods called from Java
   base::android::ScopedJavaLocalRef<jstring> GetTitle(JNIEnv* env,
                                                       jobject obj) const;
   base::android::ScopedJavaLocalRef<jstring> GetVisibleURL(JNIEnv* env,
                                                            jobject obj) const;
   void Stop(JNIEnv* env, jobject obj);
+  float dpi_scale() const { return dpi_scale_; }

[Yaron, 2014/07/15 21:23:48]

Why did this move and why is it still duplicated in content_view_core? It
doesn't help us to partially move something and we should keep ownership more
clear. Please move things in logical blocks

[AKVT, 2014/07/16 09:53:47]

I will take care this one during next patch.

+  RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
+  jint GetBackgroundColor(JNIEnv* env, jobject obj);
+  void OnHide(JNIEnv* env, jobject obj);
+  void OnShow(JNIEnv* env, jobject obj);
+  void PauseVideo();
+  void AddStyleSheetByURL(
+      JNIEnv* env, jobject obj, jstring url);
+  void ShowInterstitialPage(
+      JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr);
+  jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
+  jboolean IsRenderWidgetHostViewReady(JNIEnv* env, jobject obj);
+  void ExitFullscreen(JNIEnv* env, jobject obj);
+  void UpdateTopControlsState(
+      JNIEnv* env,
+      jobject obj,
+      bool enable_hiding,
+      bool enable_showing,
+      bool animate);
+  void ShowImeIfNeeded(JNIEnv* env, jobject obj);
+  void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);
+  void SelectWordAroundCaret(JNIEnv* env, jobject obj);
+  ScopedJavaLocalRef<jstring> GetOriginalUrlForActiveNavigationEntry(

[Yaron, 2014/07/15 21:23:48]

base::android::ScopedJavaLocalRef

[AKVT, 2014/07/16 09:53:47]

Done.

+      JNIEnv* env,
+      jobject obj);
+  long GetNativeImeAdapter(JNIEnv* env, jobject obj);
+  bool GetUseDesktopUserAgent(JNIEnv* env, jobject obj);
+  void ClearSslPreferences(JNIEnv* env, jobject obj);
+  void SetUseDesktopUserAgent(
+      JNIEnv* env,
+      jobject obj,
+      jboolean enabled,
+      jboolean reload_on_state_change);
+  void ExtractSmartClipData(
+      JNIEnv* env,
+      jobject obj,
+      jint x,
+      jint y,
+      jint width,
+      jint height);
 
   void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss);
 
  private:
   WebContents* web_contents_;
   NavigationControllerAndroid navigation_controller_;
+  // Device scale factor.
+  float dpi_scale_;
   base::android::ScopedJavaGlobalRef<jobject> obj_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_