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

Unified Diff: chrome/browser/pepper_flash_settings_manager.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/pepper_flash_settings_manager.h ('k') | chrome/browser/plugins/plugin_prefs_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/pepper_flash_settings_manager.cc
diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc
index 6964693792da83bcc1be02bc86993a6b51c602db..e5b3e184fcddf7548dc7f4fd20f4516b5fe6892d 100644
--- a/chrome/browser/pepper_flash_settings_manager.cc
+++ b/chrome/browser/pepper_flash_settings_manager.cc
@@ -13,6 +13,7 @@
#include "base/sequenced_task_runner_helpers.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/plugins/plugin_prefs.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
@@ -927,14 +928,15 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(
}
// static
-void PepperFlashSettingsManager::RegisterUserPrefs(PrefServiceSyncable* prefs) {
- prefs->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,
- false,
- PrefServiceSyncable::UNSYNCABLE_PREF);
-
- prefs->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
- true,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+void PepperFlashSettingsManager::RegisterUserPrefs(
+ PrefRegistrySyncable* registry) {
+ registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,
+ false,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+
+ registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
+ true,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses() {
« no previous file with comments | « chrome/browser/pepper_flash_settings_manager.h ('k') | chrome/browser/plugins/plugin_prefs_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698