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

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2754 matching lines @@
   DCHECK(group != NULL);
 
   if (cmd->HasSwitch(switches::kBlockOutdatedPlugins) &&
       group->IsVulnerable()) {
     Send(new ViewHostMsg_BlockedOutdatedPlugin(routing_id_,
                                                group->GetGroupName(),
                                                GURL(group->GetUpdateURL())));
     return CreatePluginPlaceholder(frame,
                                    params,
                                    *group,
-                                   IDR_OUTDATED_PLUGIN_HTML,
+                                   IDR_BLOCKED_PLUGIN_HTML,
                                    IDS_PLUGIN_OUTDATED);
   }
   if (!info.enabled)
     return NULL;
 
   ContentSetting host_setting =
       current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
   if (info.path.value() == kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
     scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
         pepper_delegate_.CreatePepperPlugin(info.path));
     if (pepper_module)
       return CreatePepperPlugin(frame, params, info.path, pepper_module.get());
     return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type);
   }
   std::string resource;
   if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
     resource = group->identifier();
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
   if (plugin_setting == CONTENT_SETTING_ASK) {
     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);
   }
 }
 
 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
   int appcache_host_id = appcache_host ? appcache_host->host_id() : 0;
   return new WebWorkerProxy(client, RenderThread::current(), routing_id_,
                             appcache_host_id);
@@ skipping 1628 matching lines @@
     int message_id) {
   // |blocked_plugin| will delete itself when the WebViewPlugin
   // is destroyed.
   BlockedPlugin* blocked_plugin =
       new BlockedPlugin(this,
                         frame,
                         group,
                         params,
                         webkit_preferences_,
                         resource_id,
-                        l10n_util::GetStringUTF16(message_id));
+                        l10n_util::GetStringFUTF16(message_id,
+                                                   group.GetGroupName()));
   return blocked_plugin->plugin();
 }
 
 void RenderView::OnZoom(PageZoom::Function function) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
 
   double old_zoom_level = webview()->zoomLevel();
@@ skipping 1279 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }