diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 18:16:26 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 18:16:26 +0000 |
| commit | d21314202d542df5c364eec6361dfc9c15c1aa1e (patch) | |
| tree | a677624fc7b8e9a0163ac9b23b58cbaa887b62f6 | |
| parent | ac167ce76fdb3a98f1ea6aadeb121b8495f8400e (diff) | |
| download | chromium_src-d21314202d542df5c364eec6361dfc9c15c1aa1e.zip chromium_src-d21314202d542df5c364eec6361dfc9c15c1aa1e.tar.gz chromium_src-d21314202d542df5c364eec6361dfc9c15c1aa1e.tar.bz2 | |
Include a bit more information on which plugin is involved. Also use a
slightly less common cursor in the click-to-play case.
The "version" string isn't giving me much of use (Linux); the version, if
present, seems to be tagged into the name. So this seems like a nice balance.
BUG=49832
TEST=NONE
Review URL: http://codereview.chromium.org/5323001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67280 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/blocked_plugin.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/blocked_plugin.h | 1 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 1 | ||||
| -rw-r--r-- | chrome/renderer/resources/blocked_plugin.html | 5 | ||||
| -rw-r--r-- | chrome/renderer/resources/outdated_plugin.html | 3 |
5 files changed, 9 insertions, 3 deletions
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index eb259d8..39f2e51 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -31,6 +31,7 @@ static const char* const kBlockedPluginDataURL = "chrome://blockedplugindata/"; BlockedPlugin::BlockedPlugin(RenderView* render_view, WebFrame* frame, + const PluginGroup& info, const WebPluginParams& params, const WebPreferences& preferences, int template_id, @@ -46,6 +47,7 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view, DictionaryValue values; values.SetString("message", message); + values.SetString("name", info.GetGroupName()); // "t" is the id of the templates root node. std::string html_data = jstemplate_builder::GetTemplatesHtml( diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h index 2e3e825..f8637a0 100644 --- a/chrome/renderer/blocked_plugin.h +++ b/chrome/renderer/blocked_plugin.h @@ -22,6 +22,7 @@ class BlockedPlugin : public CppBoundClass, public: BlockedPlugin(RenderView* render_view, WebKit::WebFrame* frame, + const PluginGroup& info, const WebKit::WebPluginParams& params, const WebPreferences& settings, int template_id, diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 92e92e0..7c21e1b 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2611,6 +2611,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame, BlockedPlugin* blocked_plugin = new BlockedPlugin(this, frame, + *group, params, webkit_preferences_, resource_id, diff --git a/chrome/renderer/resources/blocked_plugin.html b/chrome/renderer/resources/blocked_plugin.html index d8309ed..c6eff24 100644 --- a/chrome/renderer/resources/blocked_plugin.html +++ b/chrome/renderer/resources/blocked_plugin.html @@ -50,7 +50,7 @@ p { #outer { width: 100%; height: 100%; - cursor: pointer; + cursor: crosshair; position: absolute; border: 1px black solid; -webkit-box-sizing: border-box; @@ -66,7 +66,7 @@ FIXME: This causes flickering on hover. #inner { position: relative; top: 50%; - margin-top: -50px; + margin-top: -70px; } </style> </head> @@ -76,6 +76,7 @@ FIXME: This causes flickering on hover. <div id="inner"> <div><img id="plugin_icon" src="plugin_blocked.png" /></div> <h1 i18n-content="message">PLUGIN_LOAD</h1> +<h1 id="name" i18n-content="name">PLUGIN_NAME</h1> <p id="debug"> </p> </div> </div> diff --git a/chrome/renderer/resources/outdated_plugin.html b/chrome/renderer/resources/outdated_plugin.html index 75460eb..e036016 100644 --- a/chrome/renderer/resources/outdated_plugin.html +++ b/chrome/renderer/resources/outdated_plugin.html @@ -46,7 +46,7 @@ p { #inner { position: relative; top: 50%; - margin-top: -50px; + margin-top: -70px; } </style> </head> @@ -56,6 +56,7 @@ p { <div id="inner"> <div><img id="plugin_icon" src="plugin_blocked.png" /></div> <h1 i18n-content="message">PLUGIN_OUTDATED</h1> +<h1 i18n-content="name">PLUGIN_NAME</h1> <p id="debug"> </p> </div> </div> |