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 c7fe7fdcdc13715573fbf2f236926aa08a0cee62..2b82743e5589b60e718c8b9a07c22470e7e6d9f7 100644 |
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc |
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc |
@@ -40,6 +40,7 @@ const char* kResourceTypeNames[] = { |
NULL, |
NULL, // Not used for Geolocation |
NULL, // Not used for Notifications |
+ NULL, // Not used for Auto-Submit-Certificate |
}; |
COMPILE_ASSERT(arraysize(kResourceTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |
resource_type_names_incorrect_size); |
@@ -53,6 +54,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_BLOCK, // CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE |
Mattias Nissler (ping if slow)
2011/08/09 15:37:25
Shouldn't it be ASK?
markusheintz_
2011/08/15 19:09:04
Yes. I agree that this would be better.
|
}; |
COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, |
default_settings_incorrect_size); |
@@ -68,6 +70,7 @@ const char* kTypeNames[] = { |
// for notifications and geolocation will be added next. |
"geolocation", // Only used for default Geolocation settings |
"notifications", // Only used for default Notifications settings. |
+ "auto-submit-certificate" |
wtc
2011/08/11 18:33:55
Nit: Add a comma (,) at the end of the line.
markusheintz_
2011/08/15 19:09:04
Done.
|
}; |
COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |
type_names_incorrect_size); |