| Index: components/content_settings/core/browser/content_settings_utils.cc
|
| diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
|
| index 8dbf51d08425d2edb2d58a255cb4d5c051bc058b..ed344067d073dc220fcc9eb6a50c7d58967e6b56 100644
|
| --- a/components/content_settings/core/browser/content_settings_utils.cc
|
| +++ b/components/content_settings/core/browser/content_settings_utils.cc
|
| @@ -85,6 +85,8 @@ std::string ContentSettingToString(ContentSetting setting) {
|
| return "block";
|
| case CONTENT_SETTING_SESSION_ONLY:
|
| return "session";
|
| + case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
|
| + return "detect";
|
| case CONTENT_SETTING_DEFAULT:
|
| return "default";
|
| case CONTENT_SETTING_NUM_SETTINGS:
|
| @@ -103,6 +105,8 @@ ContentSetting ContentSettingFromString(const std::string& name) {
|
| return CONTENT_SETTING_BLOCK;
|
| if (name == "session")
|
| return CONTENT_SETTING_SESSION_ONLY;
|
| + if (name == "detect")
|
| + return CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
|
|
|
| NOTREACHED() << name << " is not a recognized content setting.";
|
| return CONTENT_SETTING_DEFAULT;
|
|
|