Unify strings for click-to-play, blocked plugins and outdated plugins.

Screenshots: http://www.dropmocks.com/mNkqe

BUG=47731
TEST=none

Review URL: http://codereview.chromium.org/5857007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69520 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 36 insertions, 37 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dfd9b2c..ebc4802 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4282,13 +4282,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Click to play -->
       <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click to play UI.">
-        Click to run this plug-in
+        Click to run the <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in
       </message>
       <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in.">
         Update plug-in...
       </message>
       <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked disabled plug-in.">
-        Plug-in not allowed.
+        The <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in is not allowed.
       </message>
       <message name="IDS_PLUGIN_OUTDATED" desc="The placeholder text for an outdated disabled plug-in.">
         The <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in is out of date.
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index e879f68..2c50d8e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2781,7 +2781,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
     return CreatePluginPlaceholder(frame,
                                    params,
                                    *group,
-                                   IDR_OUTDATED_PLUGIN_HTML,
+                                   IDR_BLOCKED_PLUGIN_HTML,
                                    IDS_PLUGIN_OUTDATED);
   }
   if (!info.enabled)
@@ -2806,13 +2806,13 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
     return CreatePluginPlaceholder(frame,
                                    params,
                                    *group,
-                                   IDR_BLOCKED_PLUGIN_HTML,
+                                   IDR_CLICK_TO_PLAY_PLUGIN_HTML,
                                    IDS_PLUGIN_LOAD);
   } else {
     return CreatePluginPlaceholder(frame,
                                    params,
                                    *group,
-                                   IDR_OUTDATED_PLUGIN_HTML,
+                                   IDR_BLOCKED_PLUGIN_HTML,
                                    IDS_PLUGIN_BLOCKED);
   }
 }
@@ -4459,7 +4459,8 @@ WebPlugin* RenderView::CreatePluginPlaceholder(
                         params,
                         webkit_preferences_,
                         resource_id,
-                        l10n_util::GetStringUTF16(message_id));
+                        l10n_util::GetStringFUTF16(message_id,
+                                                   group.GetGroupName()));
   return blocked_plugin->plugin();
 }
 
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index b63b367..cbf4d4e 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -13,6 +13,7 @@ without changes to the corresponding grd file. fb9 -->
     <includes>
       <include name="IDR_BASE_JS" file="resources\base.js" type="BINDATA" />
       <include name="IDR_BLOCKED_PLUGIN_HTML" file="resources\blocked_plugin.html" flattenhtml="true" type="BINDATA" />
+      <include name="IDR_CLICK_TO_PLAY_PLUGIN_HTML" file="resources\click_to_play_plugin.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_DOM_AUTOMATION_JS" file="resources\dom_automation.js" type="BINDATA" />
       <include name="IDR_EVENT_BINDINGS_JS" file="resources\event_bindings.js" type="BINDATA" />
       <include name="IDR_EXTENSION_APITEST_JS" file="resources\extension_apitest.js" type="BINDATA" />
@@ -20,7 +21,6 @@ without changes to the corresponding grd file. fb9 -->
       <include name="IDR_GREASEMONKEY_API_JS" file="resources\greasemonkey_api.js" type="BINDATA" />
       <include name="IDR_JSON_SCHEMA_JS" file="resources\json_schema.js" type="BINDATA" />
       <include name="IDR_NET_ERROR_HTML" file="resources\neterror.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_OUTDATED_PLUGIN_HTML" file="resources\outdated_plugin.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_RENDERER_EXTENSION_BINDINGS_JS" file="resources\renderer_extension_bindings.js" type="BINDATA" />
       <include name="IDR_SAD_PLUGIN" file="resources\sadplugin.png" type="BINDATA" />
       <include name="IDR_ERROR_APP_HTML" file="resources\error_app.html" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/renderer/resources/blocked_plugin.html b/chrome/renderer/resources/blocked_plugin.html
index 29b0540..0553163 100644
--- a/chrome/renderer/resources/blocked_plugin.html
+++ b/chrome/renderer/resources/blocked_plugin.html
@@ -8,21 +8,13 @@ function debug(msg) {
 </script>
 <style>
 body {
-  background-color: rgb(128, 128, 128);
+  background-color: rgb(187, 187, 187);
   margin: 0;
   text-align: center;
   font-family: sans-serif;
   overflow: hidden;
 }
 
-body #outer:hover {
-  background: -webkit-gradient(linear, left top, left bottom, from(#d2d2d2), to(#a5a5a5));
-}
-
-body #outer:active {
-  background: -webkit-gradient(linear, left top, left bottom, from(#b9b9b9), to(#d2d2d2));
-}
-
 h1 {
   padding: 0pt 10pt;
   font-size: 10pt;
@@ -35,11 +27,7 @@ h1 {
 }
 
 #plugin_icon {
-  opacity: .4;
-}
-
-#outer:hover #plugin_icon {
-  opacity: 1.0;
+  opacity: .6;
 }
 
 p {
@@ -50,19 +38,11 @@ p {
 #outer {
   width: 100%;
   height: 100%;
-  cursor: crosshair;
   position: absolute;
   border: 1px black solid;
   box-sizing: border-box;
 }
 
-/*
-FIXME: This causes flickering on hover.
-#outer:hover {
-  -webkit-box-shadow: rgb(229,229,229) 1px 1px inset;
-}
-*/
-
 #inner {
   position: relative;
   top: 50%;
@@ -72,11 +52,10 @@ FIXME: This causes flickering on hover.
 </head>
 
 <body id="t" onSelectStart="return false;">
-<div i18n-values="title:name" id="outer" onclick="plugin.load()">
+<div i18n-values="title:name" id="outer">
 <div id="inner">
 <div><img id="plugin_icon" src="plugin_blocked.png" /></div>
-<h1 i18n-content="message">PLUGIN_LOAD</h1>
-<h1 i18n-content="name">PLUGIN_NAME</h1>
+<h1 i18n-content="message">PLUGIN_BLOCKED</h1>
 <p id="debug"> </p>
 </div>
 </div>
diff --git a/chrome/renderer/resources/outdated_plugin.html b/chrome/renderer/resources/click_to_play_plugin.html
index 590f964..05969c6f 100644
--- a/chrome/renderer/resources/outdated_plugin.html
+++ b/chrome/renderer/resources/click_to_play_plugin.html
@@ -8,13 +8,21 @@ function debug(msg) {
 </script>
 <style>
 body {
-  background-color: rgb(187, 187, 187);
+  background-color: rgb(128, 128, 128);
   margin: 0;
   text-align: center;
   font-family: sans-serif;
   overflow: hidden;
 }
 
+body #outer:hover {
+  background: -webkit-gradient(linear, left top, left bottom, from(#d2d2d2), to(#a5a5a5));
+}
+
+body #outer:active {
+  background: -webkit-gradient(linear, left top, left bottom, from(#b9b9b9), to(#d2d2d2));
+}
+
 h1 {
   padding: 0pt 10pt;
   font-size: 10pt;
@@ -27,7 +35,11 @@ h1 {
 }
 
 #plugin_icon {
-  opacity: .6;
+  opacity: .4;
+}
+
+#outer:hover #plugin_icon {
+  opacity: 1.0;
 }
 
 p {
@@ -38,11 +50,19 @@ p {
 #outer {
   width: 100%;
   height: 100%;
+  cursor: pointer;
   position: absolute;
   border: 1px black solid;
   box-sizing: border-box;
 }
 
+/*
+FIXME: This causes flickering on hover.
+#outer:hover {
+  -webkit-box-shadow: rgb(229,229,229) 1px 1px inset;
+}
+*/
+
 #inner {
   position: relative;
   top: 50%;
@@ -52,11 +72,10 @@ p {
 </head>
 
 <body id="t" onSelectStart="return false;">
-<div i18n-values="title:name" id="outer">
+<div i18n-values="title:name" id="outer" onclick="plugin.load()">
 <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>
+<h1 i18n-content="message">PLUGIN_LOAD</h1>
 <p id="debug"> </p>
 </div>
 </div>