X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fandroid_webview%2Fnative%2Faw_settings.h;h=92bf658ad505446784b840f7625eda26f77956a6;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=632862eb3768ccf2c1ab639e80a72e04c107b431;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/android_webview/native/aw_settings.h b/src/android_webview/native/aw_settings.h index 632862e..92bf658 100644 --- a/src/android_webview/native/aw_settings.h +++ b/src/android_webview/native/aw_settings.h @@ -7,7 +7,7 @@ #include -#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" @@ -35,6 +35,7 @@ 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); @@ -42,17 +43,15 @@ class AwSettings : public content::WebContentsObserver { 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; + virtual void WebContentsDestroyed() OVERRIDE; bool accelerated_2d_canvas_disabled_by_switch_; + bool renderer_prefs_initialized_; + JavaObjectWeakGlobalRef aw_settings_; };