Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1605)

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 2nd CL in series to delete PluginGroup. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 9977ced1e5c7747e9ebabef47deb86d5ed4bd535..20eee47b053e98340165167c73d3c90e9e976fc3 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -11,6 +11,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/plugin_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/views/browser_dialogs.h"
@@ -155,9 +156,14 @@ void ContentSettingBubbleContents::Init() {
if (!plugins.empty()) {
if (!bubble_content_empty)
layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
+ std::vector<webkit::WebPluginInfo> web_plugins;
+ PluginService::GetInstance()->GetPluginList()->
+ GetPluginsNoRefresh(&web_plugins);
for (std::set<std::string>::const_iterator i(plugins.begin());
i != plugins.end(); ++i) {
- string16 name = PluginService::GetInstance()->GetPluginGroupName(*i);
+ string16 name =
+ PluginInstaller::GetGroupNameByIdentifier(web_plugins, *i);
if (name.empty())
name = UTF8ToUTF16(*i);
layout->StartRow(0, single_column_set_id);

Powered by Google App Engine
This is Rietveld 408576698