Index: android_webview/browser/aw_content_browser_client.h |
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h |
index 9ff4f6ca8b50521f6fa6ae19d8775f553d95a526..cae3aeb4428bee25d57a276bc2310206ae98a3b9 100644 |
--- a/android_webview/browser/aw_content_browser_client.h |
+++ b/android_webview/browser/aw_content_browser_client.h |
@@ -5,7 +5,6 @@ |
#ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ |
#define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ |
-#include "android_webview/browser/aw_browser_context.h" |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
@@ -14,14 +13,15 @@ |
namespace android_webview { |
+class AwBrowserContext; |
+class JniDependencyFactory; |
+ |
class AwContentBrowserClient : public content::ContentBrowserClient { |
public: |
- typedef content::WebContentsViewDelegate* ViewDelegateFactoryFn( |
- content::WebContents* web_contents); |
+ static AwContentBrowserClient* FromContentBrowserClient( |
+ content::ContentBrowserClient* client); |
- AwContentBrowserClient( |
- ViewDelegateFactoryFn* view_delegate_factory, |
- GeolocationPermissionFactoryFn* geolocation_permission_factory); |
+ AwContentBrowserClient(JniDependencyFactory* native_factory); |
virtual ~AwContentBrowserClient(); |
AwBrowserContext* GetAwBrowserContext(); |
@@ -164,7 +164,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { |
// context. |
scoped_ptr<AwBrowserContext> browser_context_; |
- ViewDelegateFactoryFn* view_delegate_factory_; |
+ JniDependencyFactory* native_factory_; |
DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); |
}; |