Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4857)

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

Issue 1372353004: Making structure for ContentSettings and its corresponding strings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
index 9606a4d2fbc9130bcffe36b5373c3d9cb92ebdf9..655a8ba21fc8fbcdd874b7dc8733a068f64ec13b 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
@@ -24,8 +24,8 @@ const char* const kContentSettingNames[] = {
"allow",
"block",
"ask",
- "session_only",
Bernhard Bauer 2015/10/05 11:15:41 We are probably going to have to do this the other
Deepak 2015/10/05 12:14:38 I have removed this array here, and updated the st
- "detect_important_content"
+ "session",
+ "detect"
};
static_assert(arraysize(kContentSettingNames) <=
CONTENT_SETTING_NUM_SETTINGS,
@@ -131,11 +131,5 @@ bool StringToContentSetting(const std::string& setting_str,
return false;
}
-const char* ContentSettingToString(ContentSetting setting) {
- size_t index = static_cast<size_t>(setting);
- DCHECK_LT(index, arraysize(kContentSettingNames));
- return kContentSettingNames[index];
-}
-
} // namespace content_settings_helpers
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698