diff options
Diffstat (limited to 'chrome/browser/gtk/content_setting_bubble_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/content_setting_bubble_gtk.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/gtk/content_setting_bubble_gtk.cc b/chrome/browser/gtk/content_setting_bubble_gtk.cc index d9edf39..116b3a3 100644 --- a/chrome/browser/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/gtk/content_setting_bubble_gtk.cc @@ -14,11 +14,13 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/content_settings_window_gtk.h" #include "chrome/browser/host_content_settings_map.h" +#include "chrome/browser/plugin_updater.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/content_settings.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "chrome/common/plugin_group.h" #include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" @@ -87,14 +89,13 @@ void ContentSettingBubbleGtk::BuildBubble() { for (std::set<std::string>::const_iterator it = plugins.begin(); it != plugins.end(); ++it) { - WebPluginInfo plugin; std::string name; - if (NPAPI::PluginList::Singleton()->GetPluginInfoByPath(FilePath(*it), - &plugin)) { - name = UTF16ToUTF8(plugin.name); - } else { + PluginUpdater::PluginMap groups; + PluginUpdater::GetPluginUpdater()->GetPluginGroups(&groups); + if (groups.find(*it) != groups.end()) + name = UTF16ToUTF8(groups[*it]->GetGroupName()); + else name = *it; - } GtkWidget* label = gtk_label_new(name.c_str()); GtkWidget* label_box = gtk_hbox_new(FALSE, 0); |