| Index: chrome/browser/content_settings/content_settings_pref_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| index e4faf955bcb717ae2c5a7c99ae55ffda1727b006..a61840b6140c708c4ee2d2fcf8f07a7e65248b06 100644
|
| --- a/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| @@ -44,6 +44,7 @@ const char* kResourceTypeNames[] = {
|
| NULL,
|
| NULL,
|
| NULL, // Not used for Notifications
|
| + NULL,
|
| };
|
| COMPILE_ASSERT(arraysize(kResourceTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
|
| resource_type_names_incorrect_size);
|
| @@ -57,6 +58,7 @@ const ContentSetting kDefaultSettings[] = {
|
| CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
|
| CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
|
| + CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE
|
| };
|
| COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
|
| default_settings_incorrect_size);
|
| @@ -72,6 +74,7 @@ const char* kTypeNames[] = {
|
| // TODO(markusheintz): Refactoring in progress. Content settings exceptions
|
| // for notifications added next.
|
| "notifications", // Only used for default Notifications settings.
|
| + "auto-submit-certificate",
|
| };
|
| COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
|
| type_names_incorrect_size);
|
|
|