Add placeholder text for unsupported plug-ins.

On platforms that don't support installing plug-ins, show a "plug-in
unsupported" message instead of a "missing plug-in" message.

BUG=158871

Review URL: https://codereview.chromium.org/11414010

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

chrome/app/generated_resources.grd

@@ -7188,7 +7188,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in.">
         Update plug-in...
       </message>
-      <message name="IDS_PLUGIN_NOT_SUPPORTED" desc="The placeholder text for a plug-in that can't run in Windows Metro mode.">
+      <message name="IDS_PLUGIN_NOT_SUPPORTED_METRO" desc="The placeholder text for a plug-in that can't run in Windows Metro mode.">
         This plug-in only works on the desktop.
       </message>
       <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plug-in.">
@@ -7203,6 +7203,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_PLUGIN_NOT_AUTHORIZED" desc="The placeholder text for a plug-in that requires user permission to run.">
         <ph name="PLUGIN_NAME">$1<ex>Java</ex></ph> needs your permission to run.
       </message>
+      <message name="IDS_PLUGIN_NOT_SUPPORTED" desc="The placeholder text for an unsupported plug-in.">
+        This plug-in is not supported.
+      </message>
       <message name="IDS_PLUGIN_NOT_FOUND" desc="The placeholder text for an unknown plug-in that is not installed.">
         No plug-in available to display this content.
       </message>

chrome/renderer/chrome_content_renderer_client.cc

@@ -550,7 +550,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
             render_view, frame, params, plugin, identifier, group_name,
             IDR_BLOCKED_PLUGIN_HTML,
-            l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_SUPPORTED));
+            l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_SUPPORTED_METRO));
         render_view->Send(new ChromeViewHostMsg_NPAPINotSupported(
             render_view->GetRoutingID(), identifier));
         break;

chrome/renderer/plugins/plugin_placeholder.cc

@@ -109,7 +109,12 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
           IDR_BLOCKED_PLUGIN_HTML));
 
   DictionaryValue values;
+#if defined(ENABLE_PLUGIN_INSTALLATION)
   values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING));
+#else
+  values.SetString("message",
+      l10n_util::GetStringUTF8(IDS_PLUGIN_NOT_SUPPORTED));
+#endif
 
   std::string html_data =
       jstemplate_builder::GetI18nTemplateHtml(template_html, &values);
@@ -122,8 +127,6 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
   RenderThread::Get()->Send(new ChromeViewHostMsg_FindMissingPlugin(
       missing_plugin->routing_id(), missing_plugin->CreateRoutingId(),
       params.mimeType.utf8()));
-#else
-  missing_plugin->OnDidNotFindMissingPlugin();
 #endif
   return missing_plugin;
 }
@@ -407,11 +410,11 @@ void PluginPlaceholder::WillDestroyPlugin() {
   delete this;
 }
 
+#if defined(ENABLE_PLUGIN_INSTALLATION)
 void PluginPlaceholder::OnDidNotFindMissingPlugin() {
   SetMessage(l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_FOUND));
 }
 
-#if defined(ENABLE_PLUGIN_INSTALLATION)
 void PluginPlaceholder::OnFoundMissingPlugin(const string16& plugin_name) {
   if (status_->value == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound)
     SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_FOUND, plugin_name));

chrome/renderer/plugins/plugin_placeholder.h

@@ -135,8 +135,8 @@ class PluginPlaceholder : public content::RenderViewObserver,
 
   void OnLoadBlockedPlugins(const std::string& identifier);
   void OnSetIsPrerendering(bool is_prerendering);
-  void OnDidNotFindMissingPlugin();
 #if defined(ENABLE_PLUGIN_INSTALLATION)
+  void OnDidNotFindMissingPlugin();
   void OnFoundMissingPlugin(const string16& plugin_name);
   void OnStartedDownloadingPlugin();
   void OnFinishedDownloadingPlugin();