| 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 fe379dfa57bda3ba2991708105183ba709dab831..01077a222b95c939fe973e7117de2156a3968adc 100644
|
| --- a/chrome/browser/pepper_flash_settings_manager.cc
|
| +++ b/chrome/browser/pepper_flash_settings_manager.cc
|
| @@ -970,14 +970,16 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(
|
|
|
| // static
|
| void PepperFlashSettingsManager::RegisterUserPrefs(
|
| - PrefRegistrySyncable* registry) {
|
| - registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,
|
| - false,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| -
|
| - registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
|
| - true,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable* registry) {
|
| + registry->RegisterBooleanPref(
|
| + prefs::kDeauthorizeContentLicenses,
|
| + false,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| +
|
| + registry->RegisterBooleanPref(
|
| + prefs::kPepperFlashSettingsEnabled,
|
| + true,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses(
|
|
|