diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 20:05:31 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 20:05:31 +0000 |
| commit | 0d8f04be5a641dd6d3fe775163a6d0fc6dc2dcae (patch) | |
| tree | bed87bd5d3515dabcec5af6ecd2587fb86e6dff5 /webkit | |
| parent | 4af101c6023e5df0dc664cd12e7feef10cf04ec6 (diff) | |
| download | chromium_src-0d8f04be5a641dd6d3fe775163a6d0fc6dc2dcae.zip chromium_src-0d8f04be5a641dd6d3fe775163a6d0fc6dc2dcae.tar.gz chromium_src-0d8f04be5a641dd6d3fe775163a6d0fc6dc2dcae.tar.bz2 | |
Change decidePolicyForNavigation() to takea WebDataSource::ExtraData
instead of a WebDataSource. It doesn't need the full WebDataSource, and
WebDataSources are difficult to mock.
This is a prerequisite for codereview.chromium.org/14212005
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/14188060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 6 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index c035876..2814bb9 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -557,9 +557,9 @@ void TestWebViewDelegate::loadURLExternally( } WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation( - WebFrame* frame, WebDataSource* dataSource, const WebURLRequest& request, - WebNavigationType type, WebNavigationPolicy default_policy, - bool is_redirect) { + WebFrame* frame, WebDataSource::ExtraData* extraData, + const WebURLRequest& request, WebNavigationType type, + WebNavigationPolicy default_policy, bool is_redirect) { WebNavigationPolicy result; if (policy_delegate_enabled_) { printf("Policy delegate: attempt to load %s with navigation type '%s'\n", diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index c995ddc..c981f2a 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -174,9 +174,9 @@ class TestWebViewDelegate : public WebKit::WebViewClient, WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy); virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( - WebKit::WebFrame*, WebKit::WebDataSource*, const WebKit::WebURLRequest&, - WebKit::WebNavigationType, WebKit::WebNavigationPolicy default_policy, - bool isRedirect); + WebKit::WebFrame*, WebKit::WebDataSource::ExtraData*, + const WebKit::WebURLRequest&, WebKit::WebNavigationType, + WebKit::WebNavigationPolicy default_policy, bool isRedirect); // DEPRECATED virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( WebKit::WebFrame*, const WebKit::WebURLRequest&, |