summaryrefslogtreecommitdiffstats
path: root/android_webview/lib
diff options
context:
space:
mode:
authortserng <tserng@amazon.com>2015-08-05 12:01:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-05 19:02:15 +0000
commit67e9830ff10d26bf8840598dde988e4af9581fde (patch)
tree0e4e5ae9897349569d078d94e549a43d4e5b0b0b /android_webview/lib
parenta8f1ac39c6a9471bb1fc16933c82cb2cd982412e (diff)
downloadchromium_src-67e9830ff10d26bf8840598dde988e4af9581fde.zip
chromium_src-67e9830ff10d26bf8840598dde988e4af9581fde.tar.gz
chromium_src-67e9830ff10d26bf8840598dde988e4af9581fde.tar.bz2
Implement HttpUserAgentSettings delegate for Android WebView
Instead of using a static accept language and user agent, we set a HttpUserAgentSettings delegate to allow those values to change dynamically. BUG=35049 Review URL: https://codereview.chromium.org/1172093002 Cr-Commit-Position: refs/heads/master@{#341931}
Diffstat (limited to 'android_webview/lib')
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc5
-rw-r--r--android_webview/lib/main/aw_main_delegate.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index f94d498..3558a04 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -10,6 +10,7 @@
#include "android_webview/common/aw_switches.h"
#include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
#include "android_webview/lib/aw_browser_dependency_factory_impl.h"
+#include "android_webview/native/aw_locale_manager_impl.h"
#include "android_webview/native/aw_media_url_interceptor.h"
#include "android_webview/native/aw_message_port_service_impl.h"
#include "android_webview/native/aw_quota_manager_bridge_impl.h"
@@ -199,6 +200,10 @@ AwMessagePortService* AwMainDelegate::CreateAwMessagePortService() {
return new AwMessagePortServiceImpl();
}
+AwLocaleManager* AwMainDelegate::CreateAwLocaleManager() {
+ return new AwLocaleManagerImpl();
+}
+
#if defined(VIDEO_HOLE)
content::ExternalVideoSurfaceContainer*
AwMainDelegate::CreateExternalVideoSurfaceContainer(
diff --git a/android_webview/lib/main/aw_main_delegate.h b/android_webview/lib/main/aw_main_delegate.h
index 5e6eefc..b701986 100644
--- a/android_webview/lib/main/aw_main_delegate.h
+++ b/android_webview/lib/main/aw_main_delegate.h
@@ -47,6 +47,7 @@ class AwMainDelegate : public content::ContentMainDelegate,
content::WebContents* web_contents) override;
AwWebPreferencesPopulater* CreateWebPreferencesPopulater() override;
AwMessagePortService* CreateAwMessagePortService() override;
+ AwLocaleManager* CreateAwLocaleManager() override;
#if defined(VIDEO_HOLE)
content::ExternalVideoSurfaceContainer* CreateExternalVideoSurfaceContainer(
content::WebContents* web_contents) override;