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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/flash_ui.cc

Issue 7564006: Rename PluginUpdater to PluginPrefs and make it per-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add static initialization again Created 9 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
« chrome/browser/profiles/profile_dependency_manager.cc ('K') | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/flash_ui.cc
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
index 77cd15f59639274202d320bbe5c579ffda714984..e0649df4b0acd5e6db45d91ce681721e5a8e2274 100644
--- a/chrome/browser/ui/webui/flash_ui.cc
+++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -11,6 +11,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/crash_upload_list.h"
+#include "chrome/browser/plugin_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
#include "chrome/browser/ui/webui/crashes_ui.h"
@@ -228,8 +229,10 @@ void FlashDOMHandler::MaybeRespondToPage() {
if (info_array.empty()) {
AddPair(list, ASCIIToUTF16("Flash plugin"), "Disabled");
} else {
+ PluginPrefs* plugin_prefs =
+ PluginPrefs::GetForProfile(web_ui_->GetProfile());
for (size_t i = 0; i < info_array.size(); ++i) {
- if (webkit::npapi::IsPluginEnabled(info_array[i])) {
+ if (plugin_prefs->IsPluginEnabled(info_array[i])) {
flash_version = info_array[i].version + ASCIIToUTF16(" ") +
info_array[i].path.LossyDisplayName();
if (i != 0)
« chrome/browser/profiles/profile_dependency_manager.cc ('K') | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698