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

Unified Diff: chrome/browser/ui/gtk/content_setting_bubble_gtk.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/gtk/content_setting_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
index 278c14f2f94ffeb1735f268181025d1700789bba..e608c0225b9a9c68c2208cfbc76928ac3e0af1b2 100644
--- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
@@ -11,6 +11,7 @@
#include "base/i18n/rtl.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/profiles/profile.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
@@ -27,6 +28,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/text/text_elider.h"
#include "ui/gfx/gtk_util.h"
+#include "webkit/plugins/npapi/plugin_list.h"
using content::PluginService;
using content::WebContents;
@@ -109,10 +111,13 @@ void ContentSettingBubbleGtk::BuildBubble() {
if (!plugins.empty()) {
GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
+ std::vector<webkit::WebPluginInfo> web_plugins;
+ PluginService::GetInstance()->GetPluginList()->
+ GetPluginsNoRefresh(&web_plugins);
for (std::set<std::string>::const_iterator it = plugins.begin();
it != plugins.end(); ++it) {
std::string name = UTF16ToUTF8(
- PluginService::GetInstance()->GetPluginGroupName(*it));
+ PluginInstaller::GetGroupNameByIdentifier(web_plugins, *it));
if (name.empty())
name = *it;

Powered by Google App Engine
This is Rietveld 408576698