Index: android_webview/browser/aw_content_browser_client.h |
=================================================================== |
--- android_webview/browser/aw_content_browser_client.h (revision 192622) |
+++ android_webview/browser/aw_content_browser_client.h (working copy) |
@@ -18,14 +18,15 @@ |
class AwContentBrowserClient : public content::ContentBrowserClient { |
public: |
- static AwContentBrowserClient* FromContentBrowserClient( |
- content::ContentBrowserClient* client); |
+ // This is what AwContentBrowserClient::GetAcceptLangs uses. |
+ static std::string GetAcceptLangsImpl(); |
+ // Returns the one AwBrowserContext for this process. |
+ static AwBrowserContext* GetAwBrowserContext(); |
+ |
AwContentBrowserClient(JniDependencyFactory* native_factory); |
virtual ~AwContentBrowserClient(); |
- AwBrowserContext* GetAwBrowserContext(); |
- |
// Overriden methods from ContentBrowserClient. |
virtual void AddCertificate(net::URLRequest* request, |
net::CertificateMimeType cert_type, |
@@ -130,7 +131,6 @@ |
virtual void UpdateInspectorSetting(content::RenderViewHost* rvh, |
const std::string& key, |
const std::string& value) OVERRIDE; |
- virtual void ClearInspectorSettings(content::RenderViewHost* rvh) OVERRIDE; |
virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE; |
virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE; |
virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE; |