Chromium Code Reviews| Index: android_webview/lib/main/aw_main_delegate.cc |
| diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc |
| index 2a8954fc0524c584175f779900c20158c8be490a..70829cc5b984a065ce00fba691980f77040579b4 100644 |
| --- a/android_webview/lib/main/aw_main_delegate.cc |
| +++ b/android_webview/lib/main/aw_main_delegate.cc |
| @@ -7,6 +7,7 @@ |
| #include "android_webview/browser/aw_content_browser_client.h" |
| #include "android_webview/lib/aw_browser_dependency_factory_impl.h" |
| #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/renderer/aw_content_renderer_client.h" |
| #include "base/command_line.h" |
| @@ -69,11 +70,7 @@ void AwMainDelegate::ProcessExiting(const std::string& process_type) { |
| content::ContentBrowserClient* |
| AwMainDelegate::CreateContentBrowserClient() { |
| - content_browser_client_.reset( |
| - new AwContentBrowserClient( |
| - &AwWebContentsViewDelegate::Create, |
| - &AwGeolocationPermissionContext::Create)); |
| - |
| + content_browser_client_.reset(new AwContentBrowserClient(this)); |
| return content_browser_client_.get(); |
| } |
| @@ -83,4 +80,19 @@ content::ContentRendererClient* |
| return content_renderer_client_.get(); |
| } |
| +AwQuotaManagerBridge* AwMainDelegate::CreateAwQuotaManagerBridge( |
| + AwBrowserContext* browser_context) { |
| + return new AwQuotaManagerBridgeImpl(browser_context); |
| +} |
| + |
| +content::GeolocationPermissionContext* |
| + AwMainDelegate::CreateGeolocationPermission() { |
| + return AwGeolocationPermissionContext::Create(); |
|
joth
2013/02/21 22:57:52
probably should pass through the browser context h
boliu
2013/02/22 00:07:02
Passed, but just ignored in AwGeolocationPermissio
|
| +} |
| + |
| +content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( |
| + content::WebContents* web_contents) { |
| + return AwWebContentsViewDelegate::Create(web_contents); |
| +} |
| + |
| } // namespace android_webview |