summaryrefslogtreecommitdiffstats
path: root/android_webview/lib/main/aw_main_delegate.cc
diff options
context:
space:
mode:
authorbenm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-27 00:18:13 +0000
committerbenm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-27 00:18:13 +0000
commit9f8797b3915aff60fa64c5d414a60f63a7aa8cdc (patch)
tree762f1e8e9af3e20279226b5d6f3cf7ee893131cc /android_webview/lib/main/aw_main_delegate.cc
parent0de80bb69486b39355955c36228d75573a31982e (diff)
downloadchromium_src-9f8797b3915aff60fa64c5d414a60f63a7aa8cdc.zip
chromium_src-9f8797b3915aff60fa64c5d414a60f63a7aa8cdc.tar.gz
chromium_src-9f8797b3915aff60fa64c5d414a60f63a7aa8cdc.tar.bz2
Currently Android WebView will push settings from the java side to the renderer, but if the browser needs to read those settings back we will use a default set from WebContentsImpl as we neglect to override ContentBrowserClient::OverrideWebKitPrefs. This means that the browser and renderer can see out of sync preference values.
Review URL: https://codereview.chromium.org/23619089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/lib/main/aw_main_delegate.cc')
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 83cd27d..7993e0c 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -12,6 +12,7 @@
#include "android_webview/native/aw_geolocation_permission_context.h"
#include "android_webview/native/aw_quota_manager_bridge_impl.h"
#include "android_webview/native/aw_web_contents_view_delegate.h"
+#include "android_webview/native/aw_web_preferences_populater_impl.h"
#include "android_webview/renderer/aw_content_renderer_client.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"
@@ -141,4 +142,8 @@ content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
return AwWebContentsViewDelegate::Create(web_contents);
}
+AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
+ return new AwWebPreferencesPopulaterImpl();
+}
+
} // namespace android_webview