Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / native / aw_settings.h

diff --git a/src/android_webview/native/aw_settings.h b/src/android_webview/native/aw_settings.h
index 632862e..d30b157 100644 (file)
--- a/src/android_webview/native/aw_settings.h
+++ b/src/android_webview/native/aw_settings.h
@@ -7,12 +7,14 @@
 
 #include <jni.h>
 
-#include "base/android/jni_helper.h"
+#include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 
+namespace content{
 struct WebPreferences;
+}
 
 namespace android_webview {
 
@@ -35,23 +37,20 @@ class AwSettings : public content::WebContentsObserver {
   void UpdateUserAgentLocked(JNIEnv* env, jobject obj);
   void UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj);
   void UpdateFormDataPreferencesLocked(JNIEnv* env, jobject obj);
+  void UpdateRendererPreferencesLocked(JNIEnv* env, jobject obj);
 
-  void PopulateWebPreferences(WebPreferences* web_prefs);
+  void PopulateWebPreferences(content::WebPreferences* web_prefs);
 
  private:
   AwRenderViewHostExt* GetAwRenderViewHostExt();
   void UpdateEverything();
 
-  // Fixed WebPreferences for Android WebView.
-  static void PopulateFixedPreferences(WebPreferences* web_prefs);
-
   // WebContentsObserver overrides:
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
+  virtual void WebContentsDestroyed() override;
 
-  bool accelerated_2d_canvas_disabled_by_switch_;
+  bool renderer_prefs_initialized_;
 
   JavaObjectWeakGlobalRef aw_settings_;
 };