[Android] Rename WebSettings to ContentSettings.

This renames the Android WebSettings class to ContentSettings.
The naming change is related to downstream refactoring.

BUG=
TEST=


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

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

8 files changed, 75 insertions, 75 deletions

diff --git a/content/app/android/content_jni_registrar.cc b/content/app/android/content_jni_registrar.cc
index 3ac6dc2..fbc6110 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -10,13 +10,13 @@
 #include "content/app/android/sandboxed_process_service.h"
 #include "content/app/android/user_agent.h"
 #include "content/browser/android/android_browser_process.h"
+#include "content/browser/android/content_settings.h"
 #include "content/browser/android/content_view_client.h"
 #include "content/browser/android/content_view_impl.h"
 #include "content/browser/android/device_info.h"
 #include "content/browser/android/download_controller.h"
 #include "content/browser/android/sandboxed_process_launcher.h"
 #include "content/browser/android/touch_point.h"
-#include "content/browser/android/web_settings.h"
 #include "content/common/android/command_line.h"
 #include "content/common/android/surface_callback.h"
 #include "content/common/android/trace_event_binding.h"
@@ -27,6 +27,7 @@ namespace android {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
   { "CommandLine", RegisterCommandLine },
+  { "ContentSettings", ContentSettings::RegisterContentSettings },
   { "ContentView", RegisterContentView },
   { "ContentViewClient", RegisterContentViewClient },
   { "ContentMain", content::RegisterContentMain },
@@ -38,7 +39,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "TouchPoint", content::RegisterTouchPoint },
   { "TraceEvent", RegisterTraceEvent },
   { "UserAgent", content::RegisterUserAgent },
-  { "WebSettings", WebSettings::RegisterWebSettings },
 };
 
 bool RegisterJni(JNIEnv* env) {
diff --git a/content/browser/android/web_settings.cc b/content/browser/android/content_settings.cc
index c4251e8..9ba1ad4 100644
--- a/content/browser/android/web_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/web_settings.h"
+#include "content/browser/android/content_settings.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ -10,7 +10,7 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
-#include "jni/web_settings_jni.h"
+#include "jni/content_settings_jni.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
@@ -27,7 +27,7 @@ using webkit_glue::WebPreferences;
 
 namespace content {
 
-struct WebSettings::FieldIds {
+struct ContentSettings::FieldIds {
   // Note on speed. One may think that an approach that reads field values via
   // JNI is ineffective and should not be used. Please keep in mind that in the
   // legacy WebView the whole Sync method took <1ms on Xoom, and no one is
@@ -39,7 +39,7 @@ struct WebSettings::FieldIds {
 
     // FIXME: we should be using a new GetFieldIDFromClassName() with caching.
     ScopedJavaLocalRef<jclass> clazz(
-        GetClass(env, "org/chromium/content/browser/WebSettings"));
+        GetClass(env, "org/chromium/content/browser/ContentSettings"));
     standard_fond_family =
         GetFieldID(env, clazz, "mStandardFontFamily", kStringClassName);
     fixed_font_family =
@@ -88,34 +88,34 @@ struct WebSettings::FieldIds {
   jfieldID java_script_can_open_windows_automatically;
 };
 
-WebSettings::WebSettings(JNIEnv* env,
+ContentSettings::ContentSettings(JNIEnv* env,
                          jobject obj,
                          WebContents* contents,
                          bool is_master_mode)
     : WebContentsObserver(contents),
       is_master_mode_(is_master_mode) {
-  web_settings_.Reset(env, obj);
+  content_settings_.Reset(env, obj);
 }
 
-WebSettings::~WebSettings() {
+ContentSettings::~ContentSettings() {
 }
 
 // static
-bool WebSettings::RegisterWebSettings(JNIEnv* env) {
+bool ContentSettings::RegisterContentSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-void WebSettings::Destroy(JNIEnv* env, jobject obj) {
+void ContentSettings::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
-void WebSettings::SyncFromNativeImpl() {
+void ContentSettings::SyncFromNativeImpl() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
   if (!field_ids_.get())
     field_ids_.reset(new FieldIds(env));
 
-  jobject obj = web_settings_.obj();
+  jobject obj = content_settings_.obj();
   RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   WebPreferences prefs = render_view_host->GetDelegate()->GetWebkitPrefs();
 
@@ -190,17 +190,17 @@ void WebSettings::SyncFromNativeImpl() {
       prefs.javascript_can_open_windows_automatically);
   CheckException(env);
 
-  Java_WebSettings_setPluginsDisabled(env, obj, !prefs.plugins_enabled);
+  Java_ContentSettings_setPluginsDisabled(env, obj, !prefs.plugins_enabled);
   CheckException(env);
 }
 
-void WebSettings::SyncToNativeImpl() {
+void ContentSettings::SyncToNativeImpl() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
   if (!field_ids_.get())
     field_ids_.reset(new FieldIds(env));
 
-  jobject obj = web_settings_.obj();
+  jobject obj = content_settings_.obj();
   RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   WebPreferences prefs = render_view_host->GetDelegate()->GetWebkitPrefs();
 
@@ -266,20 +266,20 @@ void WebSettings::SyncToNativeImpl() {
   prefs.javascript_can_open_windows_automatically = env->GetBooleanField(
       obj, field_ids_->java_script_can_open_windows_automatically);
 
-  prefs.plugins_enabled = !Java_WebSettings_getPluginsDisabled(env, obj);
+  prefs.plugins_enabled = !Java_ContentSettings_getPluginsDisabled(env, obj);
 
   render_view_host->UpdateWebkitPreferences(prefs);
 }
 
-void WebSettings::SyncFromNative(JNIEnv* env, jobject obj) {
+void ContentSettings::SyncFromNative(JNIEnv* env, jobject obj) {
   SyncFromNativeImpl();
 }
 
-void WebSettings::SyncToNative(JNIEnv* env, jobject obj) {
+void ContentSettings::SyncToNative(JNIEnv* env, jobject obj) {
   SyncToNativeImpl();
 }
 
-void WebSettings::RenderViewCreated(RenderViewHost* render_view_host) {
+void ContentSettings::RenderViewCreated(RenderViewHost* render_view_host) {
   if (is_master_mode_)
     SyncToNativeImpl();
 }
@@ -290,9 +290,9 @@ jint Init(
   WebContents* web_contents =
       reinterpret_cast<ContentViewImpl*>(nativeContentView)
           ->web_contents();
-  WebSettings* web_settings =
-      new WebSettings(env, obj, web_contents, is_master_mode);
-  return reinterpret_cast<jint>(web_settings);
+  ContentSettings* content_settings =
+      new ContentSettings(env, obj, web_contents, is_master_mode);
+  return reinterpret_cast<jint>(content_settings);
 }
 
 jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
diff --git a/content/browser/android/web_settings.h b/content/browser/android/content_settings.h
index b463396..684b725 100644
--- a/content/browser/android/web_settings.h
+++ b/content/browser/android/content_settings.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_WEB_SETTINGS_H_
-#define CONTENT_BROWSER_ANDROID_WEB_SETTINGS_H_
+#ifndef CONTENT_BROWSER_ANDROID_CONTENT_SETTINGS_H_
+#define CONTENT_BROWSER_ANDROID_CONTENT_SETTINGS_H_
 #pragma once
 
 #include <jni.h>
@@ -14,14 +14,14 @@
 
 namespace content {
 
-class WebSettings : public WebContentsObserver {
+class ContentSettings : public WebContentsObserver {
  public:
-  WebSettings(JNIEnv* env, jobject obj,
-              WebContents* contents,
-              bool is_master_mode);
-  virtual ~WebSettings();
+  ContentSettings(JNIEnv* env, jobject obj,
+                  WebContents* contents,
+                  bool is_master_mode);
+  virtual ~ContentSettings();
 
-  static bool RegisterWebSettings(JNIEnv* env);
+  static bool RegisterContentSettings(JNIEnv* env);
 
   void Destroy(JNIEnv* env, jobject obj);
 
@@ -47,9 +47,9 @@ class WebSettings : public WebContentsObserver {
   scoped_ptr<FieldIds> field_ids_;
 
   // The Java counterpart to this class.
-  base::android::ScopedJavaGlobalRef<jobject> web_settings_;
+  base::android::ScopedJavaGlobalRef<jobject> content_settings_;
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_WEB_SETTINGS_H_
+#endif  // CONTENT_BROWSER_ANDROID_CONTENT_SETTINGS_H_
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f17ab16..8027152 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -188,14 +188,16 @@
     'browser/accessibility/browser_accessibility_win.h',
     'browser/android/android_browser_process.cc',
     'browser/android/android_browser_process.h',
+    'browser/android/content_settings.cc',
+    'browser/android/content_settings.h',
     'browser/android/content_startup_flags.cc',
     'browser/android/content_startup_flags.h',
     'browser/android/content_util.cc',
     'browser/android/content_util.h',
-    'browser/android/content_view_impl.cc',
-    'browser/android/content_view_impl.h',
     'browser/android/content_view_client.cc',
     'browser/android/content_view_client.h',
+    'browser/android/content_view_impl.cc',
+    'browser/android/content_view_impl.h',
     'browser/android/device_info.cc',
     'browser/android/device_info.h',
     'browser/android/download_controller.cc',
@@ -206,8 +208,6 @@
     'browser/android/sandboxed_process_launcher.h',
     'browser/android/touch_point.cc',
     'browser/android/touch_point.h',
-    'browser/android/web_settings.cc',
-    'browser/android/web_settings.h',
     'browser/appcache/appcache_dispatcher_host.cc',
     'browser/appcache/appcache_dispatcher_host.h',
     'browser/appcache/appcache_frontend_proxy.cc',
diff --git a/content/content_jni.gypi b/content/content_jni.gypi
index caeddd9..5bc5caf 100644
--- a/content/content_jni.gypi
+++ b/content/content_jni.gypi
@@ -14,6 +14,7 @@
       'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java',
       'public/android/java/src/org/chromium/content/app/UserAgent.java',
       'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java',
+      'public/android/java/src/org/chromium/content/browser/ContentSettings.java',
       'public/android/java/src/org/chromium/content/browser/ContentView.java',
       'public/android/java/src/org/chromium/content/browser/ContentViewClient.java',
       'public/android/java/src/org/chromium/content/browser/DeviceInfo.java',
@@ -22,7 +23,6 @@
       'public/android/java/src/org/chromium/content/browser/LocationProvider.java',
       'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java',
       'public/android/java/src/org/chromium/content/browser/TouchPoint.java',
-      'public/android/java/src/org/chromium/content/browser/WebSettings.java',
       'public/android/java/src/org/chromium/content/common/CommandLine.java',
       'public/android/java/src/org/chromium/content/common/SurfaceCallback.java',
       'public/android/java/src/org/chromium/content/common/TraceEvent.java',
@@ -33,6 +33,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h',
+      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_settings_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_info_jni.h',
@@ -41,7 +42,6 @@
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/touch_point_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/web_settings_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h',
diff --git a/content/public/android/java/src/org/chromium/content/browser/WebSettings.java b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
index 10a2087..3aa627a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/WebSettings.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
@@ -14,25 +14,25 @@ import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 
 /**
- * Manages settings state for a ContentView. A WebSettings instance is obtained
- * from ContentView.getSettings(). If ContentView is used in the
+ * Manages settings state for a ContentView. A ContentSettings instance is obtained
+ * from ContentView.getContentSettings(). If ContentView is used in the
  * ContentView.PERSONALITY_VIEW role, all settings are read / write. If ContentView
  * is in the ContentView.PERSONALITY_CHROME role, setting can only be read.
  */
 @JNINamespace("content")
-public class WebSettings {
-    private static final String TAG = "WebSettings";
+public class ContentSettings {
+    private static final String TAG = "ContentSettings";
 
     // This class must be created on the UI thread. Afterwards, it can be
     // used from any thread. Internally, the class uses a message queue
     // to call native code on the UI thread only.
 
-    private int mNativeWebSettings = 0;
+    private int mNativeContentSettings = 0;
 
     private ContentView mContentView;
 
     // When ContentView is used in PERSONALITY_CHROME mode, settings can't
-    // be modified through the WebSettings instance.
+    // be modified through the ContentSettings instance.
     private boolean mCanModifySettings;
 
     // A flag to avoid sending superfluous synchronization messages.
@@ -90,8 +90,8 @@ public class WebSettings {
                         public void handleMessage(Message msg) {
                             switch (msg.what) {
                                 case SYNC:
-                                    synchronized (WebSettings.this) {
-                                        nativeSyncToNative(mNativeWebSettings);
+                                    synchronized (ContentSettings.this) {
+                                        nativeSyncToNative(mNativeContentSettings);
                                         mIsSyncMessagePending = false;
                                     }
                                     break;
@@ -113,8 +113,8 @@ public class WebSettings {
                         public void handleMessage(Message msg) {
                             switch (msg.what) {
                                 case SYNC:
-                                    synchronized (WebSettings.this) {
-                                        nativeSyncFromNative(mNativeWebSettings);
+                                    synchronized (ContentSettings.this) {
+                                        nativeSyncFromNative(mNativeContentSettings);
                                         mIsSyncMessagePending = false;
                                     }
                                     break;
@@ -140,37 +140,37 @@ public class WebSettings {
      * Package constructor to prevent clients from creating a new settings
      * instance. Must be called on the UI thread.
      */
-    WebSettings(ContentView contentView, int nativeContentView) {
+    ContentSettings(ContentView contentView, int nativeContentView) {
         ThreadUtils.assertOnUiThread();
         mContentView = contentView;
         mCanModifySettings = mContentView.isPersonalityView();
-        mNativeWebSettings = nativeInit(nativeContentView, mCanModifySettings);
-        assert mNativeWebSettings != 0;
+        mNativeContentSettings = nativeInit(nativeContentView, mCanModifySettings);
+        assert mNativeContentSettings != 0;
 
         mEventHandler = new EventHandler();
         if (mCanModifySettings) {
             // PERSONALITY_VIEW
             mDefaultUserAgent = nativeGetDefaultUserAgent();
             mUserAgent = mDefaultUserAgent;
-            nativeSyncToNative(mNativeWebSettings);
+            nativeSyncToNative(mNativeContentSettings);
         } else {
             // PERSONALITY_CHROME
             // Chrome has zooming enabled by default. These settings are not
             // set by the native code.
             mBuiltInZoomControls = true;
             mDisplayZoomControls = false;
-            nativeSyncFromNative(mNativeWebSettings);
+            nativeSyncFromNative(mNativeContentSettings);
         }
     }
 
     /**
-     * Destroys the native side of the WebSettings. This WebSettings object
+     * Destroys the native side of the ContentSettings. This ContentSettings object
      * cannot be used after this method has been called. Should only be called
      * when related ContentView is destroyed.
      */
     void destroy() {
-        nativeDestroy(mNativeWebSettings);
-        mNativeWebSettings = 0;
+        nativeDestroy(mNativeContentSettings);
+        mNativeContentSettings = 0;
     }
 
     /**
@@ -665,16 +665,16 @@ public class WebSettings {
         }
     }
 
-    // Initialize the WebSettings native side.
+    // Initialize the ContentSettings native side.
     private native int nativeInit(int contentViewPtr, boolean isMasterMode);
 
-    private native void nativeDestroy(int nativeWebSettings);
+    private native void nativeDestroy(int nativeContentSettings);
 
     private static native String nativeGetDefaultUserAgent();
 
     // Synchronize Java settings from native settings.
-    private native void nativeSyncFromNative(int nativeWebSettings);
+    private native void nativeSyncFromNative(int nativeContentSettings);
 
     // Synchronize native settings from Java settings.
-    private native void nativeSyncToNative(int nativeWebSettings);
+    private native void nativeSyncToNative(int nativeContentSettings);
 }
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index 10b636a..02ab7c7 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -53,7 +53,7 @@ public class ContentView extends FrameLayout {
     // in terms of clean up.
     private ContentViewClient mContentViewClient;
 
-    private WebSettings mWebSettings;
+    private ContentSettings mContentSettings;
 
     // Native pointer to C++ ContentView object which will be set by nativeInit()
     private int mNativeContentView = 0;
@@ -118,7 +118,7 @@ public class ContentView extends FrameLayout {
         mNativeContentView = nativeInit(nativeWebContents);
 
         mPersonality = personality;
-        mWebSettings = new WebSettings(this, mNativeContentView);
+        mContentSettings = new ContentSettings(this, mNativeContentView);
 
         initGestureDetectors(context);
 
@@ -152,9 +152,9 @@ public class ContentView extends FrameLayout {
             nativeDestroy(mNativeContentView);
             mNativeContentView = 0;
         }
-        if (mWebSettings != null) {
-            mWebSettings.destroy();
-            mWebSettings = null;
+        if (mContentSettings != null) {
+            mContentSettings.destroy();
+            mContentSettings = null;
         }
     }
 
@@ -221,7 +221,7 @@ public class ContentView extends FrameLayout {
                         mNativeContentView,
                         url,
                         pageTransition,
-                        mWebSettings.getUserAgentString());
+                        mContentSettings.getUserAgentString());
             } else {
                 // Chrome stores overridden UA strings in navigation history
                 // items, so they stay the same on going back / forward.
@@ -375,17 +375,17 @@ public class ContentView extends FrameLayout {
     }
 
     /**
-     * Return the WebSettings object used to control the settings for this
+     * Return the ContentSettings object used to control the settings for this
      * WebView.
      *
      * Note that when ContentView is used in the PERSONALITY_CHROME role,
-     * WebSettings can only be used for retrieving settings values. For
+     * ContentSettings can only be used for retrieving settings values. For
      * modifications, ChromeNativePreferences is to be used.
-     * @return A WebSettings object that can be used to control this WebView's
+     * @return A ContentSettings object that can be used to control this WebView's
      *         settings.
      */
-    public WebSettings getSettings() {
-        return mWebSettings;
+    public ContentSettings getContentSettings() {
+        return mContentSettings;
     }
 
     private void initGestureDetectors(final Context context) {
@@ -539,7 +539,7 @@ public class ContentView extends FrameLayout {
 
     // Invokes the graphical zoom picker widget for this ContentView.
     public void invokeZoomPicker() {
-        if (mWebSettings.supportZoom()) {
+        if (mContentSettings.supportZoom()) {
             mZoomManager.invokeZoomPicker();
         }
     }
diff --git a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
index 8e7ae08..8ee98ea 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
@@ -148,12 +148,12 @@ class ZoomManager {
 
     void updateMultiTouchSupport() {
         mMultiTouchListener.setPermanentlyIgnoreDetectorEvents(
-            !mContentView.getSettings().supportsMultiTouchZoom());
+            !mContentView.getContentSettings().supportsMultiTouchZoom());
     }
 
     private ZoomButtonsController getZoomControls() {
         if (mZoomButtonsController == null &&
-            mContentView.getSettings().shouldDisplayZoomControls()) {
+            mContentView.getContentSettings().shouldDisplayZoomControls()) {
             mZoomButtonsController = new ZoomButtonsController(mContentView);
             mZoomButtonsController.setOnZoomListener(new ZoomListener());
             // ZoomButtonsController positions the buttons at the bottom, but in