diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 14:49:01 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 14:49:01 +0000 |
| commit | 6ac77cba804aeb102dcc636bed567c3bb7b48f5e (patch) | |
| tree | 1071173db6b16e5fdff97c21823bb05a06668959 /webkit/tools | |
| parent | a7fb2513ba11ff13b20614f86bd372846a10dd2f (diff) | |
| download | chromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.zip chromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.tar.gz chromium_src-6ac77cba804aeb102dcc636bed567c3bb7b48f5e.tar.bz2 | |
Show a replacement plug-in for loading errors.
This allows us to show a nicer placeholder when loading a plug-in fails then the one coming from WebKit.
BUG=123580
TEST=manual
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=134620
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=134630
Review URL: http://codereview.chromium.org/10093011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 9c5d4f9..70fae86 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -944,6 +944,11 @@ void TestWebViewDelegate::openFileSystem( // WebPluginPageDelegate ----------------------------------------------------- +WebKit::WebPlugin* TestWebViewDelegate::CreatePluginReplacement( + const FilePath& file_path) { + return NULL; +} + WebCookieJar* TestWebViewDelegate::GetCookieJar() { return WebKit::webKitPlatformSupport()->cookieJar(); } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 8a87db3..435830a 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -241,6 +241,8 @@ class TestWebViewDelegate : public WebKit::WebViewClient, virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( const FilePath& url, const std::string& mime_type) OVERRIDE; + virtual WebKit::WebPlugin* CreatePluginReplacement( + const FilePath& file_path) OVERRIDE; virtual void CreatedPluginWindow( gfx::PluginWindowHandle handle) OVERRIDE; virtual void WillDestroyPluginWindow( |