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

Unified Diff: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

Issue 10917189: Remove PluginFinder async interface (Closed) Base URL: http://git.chromium.org/chromium/src.git@separate_finder_thread_safety
Patch Set: ... Created 8 years, 3 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 7366f54df74ef916ec8a24cb515ea12d716260b0..07398177f19dbbd53c96160b28d0d3dfdb71cbcb 100644
--- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
@@ -11,6 +11,8 @@
#include "base/i18n/rtl.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/plugins/plugin_finder.h"
+#include "chrome/browser/plugins/plugin_metadata.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"
@@ -108,13 +110,10 @@ void ContentSettingBubbleGtk::BuildBubble() {
if (!plugins.empty()) {
GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
+ PluginFinder* finder = PluginFinder::GetInstance();
for (std::set<std::string>::const_iterator it = plugins.begin();
it != plugins.end(); ++it) {
- std::string name = UTF16ToUTF8(
- PluginService::GetInstance()->GetPluginGroupName(*it));
- if (name.empty())
- name = *it;
-
+ std::string name = UTF16ToUTF8(finder->FindPluginNameWithIdentifier(*it));
GtkWidget* label = theme_provider->BuildLabel(
BuildElidedText(name).c_str(), ui::kGdkBlack);
GtkWidget* label_box = gtk_hbox_new(FALSE, 0);

Powered by Google App Engine
This is Rietveld 408576698