Split out ContentViewCore from ContentView for embedders.

content/public/android/java/src/org/chromium/content/browser/ContentSettings.java

 // 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.
 
 package org.chromium.content.browser;
 
 import android.os.Handler;
 import android.os.Message;
 import android.webkit.WebSettings.PluginState;
 import android.webkit.WebView;
@@ skipping 11 matching lines @@
 @JNINamespace("content")
 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 mNativeContentSettings = 0;
 
-    private ContentView mContentView;
+    private ContentViewCore mContentViewCore;
 
     // When ContentView is used in PERSONALITY_CHROME mode, settings can't
     // be modified through the ContentSettings instance.
     private boolean mCanModifySettings;
 
     // A flag to avoid sending superfluous synchronization messages.
     private boolean mIsSyncMessagePending = false;
     // Custom handler that queues messages to call native code on the UI thread.
     private final EventHandler mEventHandler;
 
@@ skipping 34 matching lines @@
         // Message id for syncing
         private static final int SYNC = 0;
         // Message id for updating user agent in the view
         private static final int UPDATE_UA = 1;
         // Message id for updating multi-touch zoom state in the view
         private static final int UPDATE_MULTI_TOUCH = 2;
         // Actual UI thread handler
         private Handler mHandler;
 
         EventHandler() {
-            mHandler = mContentView.isPersonalityView() ?
+            mHandler = mContentViewCore.isPersonalityView() ?
                     new Handler() {
                         @Override
                         public void handleMessage(Message msg) {
                             switch (msg.what) {
                                 case SYNC:
                                     synchronized (ContentSettings.this) {
                                         nativeSyncToNative(mNativeContentSettings);
                                         mIsSyncMessagePending = false;
                                     }
                                     break;
                                 case UPDATE_UA:
-                                    synchronized (mContentView) {
-                                        mContentView.setAllUserAgentOverridesInHistory();
+                                    synchronized (mContentViewCore) {
+                                        mContentViewCore.setAllUserAgentOverridesInHistory();
                                     }
                                     break;
                                 case UPDATE_MULTI_TOUCH:
-                                    synchronized (mContentView) {
-                                        mContentView.updateMultiTouchZoomSupport();
+                                    synchronized (mContentViewCore) {
+                                        mContentViewCore.updateMultiTouchZoomSupport();
                                     }
                                     break;
                             }
                         }
                     } :
                     new Handler() {
                         @Override
                         public void handleMessage(Message msg) {
                             switch (msg.what) {
                                 case SYNC:
@@ skipping 17 matching lines @@
 
         private synchronized void sendUpdateMultiTouchMessage() {
             mHandler.sendMessage(Message.obtain(null, UPDATE_MULTI_TOUCH));
         }
     }
 
     /**
      * Package constructor to prevent clients from creating a new settings
      * instance. Must be called on the UI thread.
      */
-    ContentSettings(ContentView contentView, int nativeContentView) {
+    ContentSettings(ContentViewCore contentViewCore, int nativeContentView) {
         ThreadUtils.assertOnUiThread();
-        mContentView = contentView;
-        mCanModifySettings = mContentView.isPersonalityView();
+        mContentViewCore = contentViewCore;
+        mCanModifySettings = mContentViewCore.isPersonalityView();
         mNativeContentSettings = nativeInit(nativeContentView, mCanModifySettings);
         assert mNativeContentSettings != 0;
 
         mEventHandler = new EventHandler();
         if (mCanModifySettings) {
             // PERSONALITY_VIEW
             mDefaultUserAgent = nativeGetDefaultUserAgent();
             mUserAgent = mDefaultUserAgent;
             nativeSyncToNative(mNativeContentSettings);
         } else {
@@ skipping 514 matching lines @@
     private native void nativeDestroy(int nativeContentSettings);
 
     private static native String nativeGetDefaultUserAgent();
 
     // Synchronize Java settings from native settings.
     private native void nativeSyncFromNative(int nativeContentSettings);
 
     // Synchronize native settings from Java settings.
     private native void nativeSyncToNative(int nativeContentSettings);
 }