| Index: chrome/browser/dom_ui/content_settings_handler.cc
|
| diff --git a/chrome/browser/dom_ui/content_settings_handler.cc b/chrome/browser/dom_ui/content_settings_handler.cc
|
| index c89fac3c8242de0eec46955f080caa6b5bcc150c..9a006b84c029296199a59163994d478182c5299e 100644
|
| --- a/chrome/browser/dom_ui/content_settings_handler.cc
|
| +++ b/chrome/browser/dom_ui/content_settings_handler.cc
|
| @@ -63,6 +63,8 @@ std::string ContentSettingToString(ContentSetting setting) {
|
| switch (setting) {
|
| case CONTENT_SETTING_ALLOW:
|
| return "allow";
|
| + case CONTENT_SETTING_ASK:
|
| + return "ask";
|
| case CONTENT_SETTING_BLOCK:
|
| return "block";
|
|
|
| @@ -75,6 +77,8 @@ std::string ContentSettingToString(ContentSetting setting) {
|
| ContentSetting ContentSettingFromString(const std::string& name) {
|
| if (name == "allow")
|
| return CONTENT_SETTING_ALLOW;
|
| + if (name == "ask")
|
| + return CONTENT_SETTING_ASK;
|
| if (name == "block")
|
| return CONTENT_SETTING_BLOCK;
|
|
|
|
|