OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/content_settings/content_settings_default_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_default_provider.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN | 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN |
45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK | 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK |
46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT | 46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT |
47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM | 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM |
48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC | 48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC |
49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA | 49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA |
50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS | 50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS |
51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER | 51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER |
52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS | 52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS |
53 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX | 53 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX |
| 54 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING |
54 #if defined(OS_WIN) | 55 #if defined(OS_WIN) |
55 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP | 56 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP |
56 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) | 57 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) |
57 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER | 58 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER |
58 #endif | 59 #endif |
59 #if defined(OS_ANDROID) | 60 #if defined(OS_ANDROID) |
60 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER | 61 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER |
61 #endif | 62 #endif |
62 }; | 63 }; |
63 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, | 64 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 "ContentSettings.DefaultMediaStreamSetting", | 163 "ContentSettings.DefaultMediaStreamSetting", |
163 ValueToContentSetting( | 164 ValueToContentSetting( |
164 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()), | 165 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()), |
165 CONTENT_SETTING_NUM_SETTINGS); | 166 CONTENT_SETTING_NUM_SETTINGS); |
166 UMA_HISTOGRAM_ENUMERATION( | 167 UMA_HISTOGRAM_ENUMERATION( |
167 "ContentSettings.DefaultMIDISysExSetting", | 168 "ContentSettings.DefaultMIDISysExSetting", |
168 ValueToContentSetting( | 169 ValueToContentSetting( |
169 default_settings_[CONTENT_SETTINGS_TYPE_MIDI_SYSEX].get()), | 170 default_settings_[CONTENT_SETTINGS_TYPE_MIDI_SYSEX].get()), |
170 CONTENT_SETTING_NUM_SETTINGS); | 171 CONTENT_SETTING_NUM_SETTINGS); |
171 | 172 |
| 173 // TODO(miguelg): Add UMA for Push messaging here |
| 174 |
172 pref_change_registrar_.Init(prefs_); | 175 pref_change_registrar_.Init(prefs_); |
173 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind( | 176 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind( |
174 &DefaultProvider::OnPreferenceChanged, base::Unretained(this)); | 177 &DefaultProvider::OnPreferenceChanged, base::Unretained(this)); |
175 pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback); | 178 pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback); |
176 } | 179 } |
177 | 180 |
178 DefaultProvider::~DefaultProvider() { | 181 DefaultProvider::~DefaultProvider() { |
179 } | 182 } |
180 | 183 |
181 bool DefaultProvider::SetWebsiteSetting( | 184 bool DefaultProvider::SetWebsiteSetting( |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 // Migrate obsolete cookie prompt mode. | 336 // Migrate obsolete cookie prompt mode. |
334 if (ValueToContentSetting( | 337 if (ValueToContentSetting( |
335 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == | 338 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == |
336 CONTENT_SETTING_ASK) { | 339 CONTENT_SETTING_ASK) { |
337 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( | 340 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( |
338 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); | 341 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); |
339 } | 342 } |
340 } | 343 } |
341 | 344 |
342 } // namespace content_settings | 345 } // namespace content_settings |
OLD | NEW |