Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm |
index 730c2f7308ba7df6eb1f2cdc90656149ac059c47..5b1186cba4342de265f987bf515d1d4d88884b80 100644 |
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm |
@@ -9,6 +9,7 @@ |
#include "base/sys_string_conversions.h" |
#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/ui/content_settings/content_setting_bubble_model.h" |
#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" |
#import "chrome/browser/ui/cocoa/info_bubble_view.h" |
@@ -18,6 +19,7 @@ |
#include "skia/ext/skia_utils_mac.h" |
#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
#include "ui/base/l10n/l10n_util.h" |
+#include "webkit/plugins/npapi/plugin_list.h" |
using content::PluginService; |
@@ -238,10 +240,13 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { |
frame.size.height -= delta; |
[[self window] setFrame:frame display:NO]; |
} else { |
+ std::vector<webkit::WebPluginInfo> web_plugins; |
+ PluginService::GetInstance()->GetPluginList()-> |
Bernhard Bauer
2012/08/21 19:14:52
This method is deprecated in favor of using the as
|
+ GetPluginsNoRefresh(&web_plugins); |
for (std::set<std::string>::iterator it = plugins.begin(); |
it != plugins.end(); ++it) { |
NSString* name = SysUTF16ToNSString( |
- PluginService::GetInstance()->GetPluginGroupName(*it)); |
+ PluginInstaller::GetGroupNameByIdentifier(web_plugins, *it)); |
if ([name length] == 0) |
name = base::SysUTF8ToNSString(*it); |
[pluginArray addObject:name]; |