diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 09:46:39 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 09:46:39 +0000 |
| commit | 15448a5bbba1d673092de19ddb3ebd53858be9b5 (patch) | |
| tree | 39b01904a35d607dcf4f9e424081443087161ff9 | |
| parent | 150f26df72853967027e60cecf36cc2c6db364ca (diff) | |
| download | chromium_src-15448a5bbba1d673092de19ddb3ebd53858be9b5.zip chromium_src-15448a5bbba1d673092de19ddb3ebd53858be9b5.tar.gz chromium_src-15448a5bbba1d673092de19ddb3ebd53858be9b5.tar.bz2 | |
The "ask" setting is still required for geolocation and notifications.
BUG=48941
TEST=OptionsUITest.LoadOptionsByURL
TBR=nkostylev
Review URL: http://codereview.chromium.org/2910011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52296 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/dom_ui/content_settings_handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/content_settings_handler.cc b/chrome/browser/dom_ui/content_settings_handler.cc index c89fac3..9a006b8 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; |