diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 00:46:45 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 00:46:45 +0000 |
| commit | 0928ecfa1c3b40d7818c3160c24426f0040c06a3 (patch) | |
| tree | 96444a8c01e2646509f775a2fdabc5fc8cbd03f1 /chrome/renderer/plugins | |
| parent | d0ab88a5086c51c466fd0502a43cca650e509d0d (diff) | |
| download | chromium_src-0928ecfa1c3b40d7818c3160c24426f0040c06a3.zip chromium_src-0928ecfa1c3b40d7818c3160c24426f0040c06a3.tar.gz chromium_src-0928ecfa1c3b40d7818c3160c24426f0040c06a3.tar.bz2 | |
Changed text for blocked NaCl plugins and replacement HTML behaviour.
BUG=154110
TEST=check the new UI on machines where NaCl isn't supported
Review URL: https://chromiumcodereview.appspot.com/11027042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index 555b65f..c3eeff5 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -162,9 +162,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin( const std::string& identifier, const string16& name, int template_id, - int message_id) { - string16 message = l10n_util::GetStringFUTF16(message_id, name); - + const string16& message) { DictionaryValue values; values.SetString("message", message); values.SetString("name", name); diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h index 75bb1bd..efd19fc 100644 --- a/chrome/renderer/plugins/plugin_placeholder.h +++ b/chrome/renderer/plugins/plugin_placeholder.h @@ -45,7 +45,7 @@ class PluginPlaceholder : public content::RenderViewObserver, const std::string& identifier, const string16& name, int resource_id, - int message_id); + const string16& message); #if defined(ENABLE_MOBILE_YOUTUBE_PLUGIN) // Placeholder for old style embedded youtube video on mobile device. For old |