[Android WebView] Expose resetScrollAndScaleState from AwSettings

As joth@ has suggested, let's not expose AwContents to ContentSettingsAdapter,
so make resetScrollAndScaleState available on AwSettings instead.


Review URL: https://chromiumcodereview.appspot.com/12374012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185334 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 6 deletions

diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 14332fe..4176419 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -677,10 +677,6 @@ jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) {
   return reinterpret_cast<jint>(pending_contents_.release());
 }
 
-void AwContents::ResetScrollAndScaleState(JNIEnv* env, jobject obj) {
-  render_view_host_ext_->ResetScrollAndScaleState();
-}
-
 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
                                                        jobject obj) {
   return browser_view_renderer_->CapturePicture();
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 156c33b..06698d5 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -162,8 +162,6 @@ class AwContents : public FindHelper::Listener,
   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
   jint ReleasePopupWebContents(JNIEnv* env, jobject obj);
 
-  void ResetScrollAndScaleState(JNIEnv* env, jobject obj);
-
  private:
   void SetWebContents(content::WebContents* web_contents);
 
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index 941eb0b..2af6f5e 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -32,6 +32,12 @@ AwRenderViewHostExt* AwSettings::GetAwRenderViewHostExt() {
   return contents->render_view_host_ext();
 }
 
+void AwSettings::ResetScrollAndScaleState(JNIEnv* env, jobject obj) {
+  AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
+  if (!rvhe) return;
+  rvhe->ResetScrollAndScaleState();
+}
+
 void AwSettings::SetEnableFixedLayoutMode(
     JNIEnv* env, jobject obj, jboolean enabled) {
   if (enable_fixed_layout_ == enabled) return;
diff --git a/android_webview/native/aw_settings.h b/android_webview/native/aw_settings.h
index 3088b1f..de21024 100644
--- a/android_webview/native/aw_settings.h
+++ b/android_webview/native/aw_settings.h
@@ -22,6 +22,7 @@ class AwSettings : public content::WebContentsObserver {
 
   // Called from Java.
   void Destroy(JNIEnv* env, jobject obj);
+  void ResetScrollAndScaleState(JNIEnv* env, jobject obj);
   void SetEnableFixedLayoutMode(JNIEnv* env, jobject obj, jboolean enabled);
   void SetInitialPageScale(JNIEnv* env, jobject obj, jfloat page_scale_percent);
   void SetTextZoom(JNIEnv* env, jobject obj, jint text_zoom_percent);