| Index: chrome/browser/content_settings/content_settings_default_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
|
| index 9f278790b249347180f41d81d2907a8e7f1ec72f..8673960f130427c0fe0d65481cb5e8e3ada120cb 100644
|
| --- a/chrome/browser/content_settings/content_settings_default_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_default_provider.cc
|
| @@ -51,6 +51,7 @@ const ContentSetting kDefaultSettings[] = {
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX
|
| + CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING
|
| #if defined(OS_WIN)
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP
|
| #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
| @@ -169,6 +170,8 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
|
| default_settings_[CONTENT_SETTINGS_TYPE_MIDI_SYSEX].get()),
|
| CONTENT_SETTING_NUM_SETTINGS);
|
|
|
| + // TODO(miguelg): Add UMA for Push messaging here
|
| +
|
| pref_change_registrar_.Init(prefs_);
|
| PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(
|
| &DefaultProvider::OnPreferenceChanged, base::Unretained(this));
|
|
|