Add placeholder text for unsupported plug-ins.

chrome/renderer/plugins/plugin_placeholder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/plugins/plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/string_piece.h"
@@ skipping 91 matching lines @@
 // static
 PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
     RenderView* render_view,
     WebFrame* frame,
     const WebPluginParams& params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           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);
 
   // |missing_plugin| will destroy itself when its WebViewPlugin is going away.
   PluginPlaceholder* missing_plugin = new PluginPlaceholder(
       render_view, frame, params, html_data, params.mimeType);
   missing_plugin->set_allow_loading(true);
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   RenderThread::Get()->Send(new ChromeViewHostMsg_FindMissingPlugin(
       missing_plugin->routing_id(), missing_plugin->CreateRoutingId(),
       params.mimeType.utf8()));
-#else
-  missing_plugin->OnDidNotFindMissingPlugin();
 #endif
   return missing_plugin;
 }
 
 PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin(
     RenderView* render_view,
     const FilePath& file_path) {
   DictionaryValue values;
   values.SetString("message",
                    l10n_util::GetStringUTF8(IDS_PLUGIN_INITIALIZATION_ERROR));
@@ skipping 263 matching lines @@
           element.setAttribute("style", "display: none;");
       }
     }
   }
 }
 
 void PluginPlaceholder::WillDestroyPlugin() {
   delete this;
 }
 
 void PluginPlaceholder::OnDidNotFindMissingPlugin() {

[Bernhard Bauer, 2012/11/30 14:58:33]

Could you move this into the #if defined(ENABLE_PLUGIN_INSTALLATION) as well
now?

[newt (away), 2012/11/30 19:41:18]

Done.

   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));
   has_host_ = true;
   plugin_name_ = plugin_name;
 }
@@ skipping 224 matching lines @@
 bool PluginPlaceholder::IsYouTubeURL(const GURL& url,
                                        const std::string& mime_type) {
   std::string host = url.host();
   bool is_youtube = EndsWith(host, "youtube.com", true) ||
       EndsWith(host, "youtube-nocookie.com", true);
 
   return is_youtube && IsValidYouTubeVideo(url.path()) &&
       LowerCaseEqualsASCII(mime_type, kFlashPluginSwfMimeType);
 }
 #endif