diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 19:51:34 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 19:51:34 +0000 |
| commit | f4b67d7f795db27a8e0835c5f254be1be6ce7c20 (patch) | |
| tree | 709714ba370a6d479d03ea887ca41f5dacc4ab2d /chrome/browser | |
| parent | 7559e78b9d44b50a1146549b4eb5139746ca8b9b (diff) | |
| download | chromium_src-f4b67d7f795db27a8e0835c5f254be1be6ce7c20.zip chromium_src-f4b67d7f795db27a8e0835c5f254be1be6ce7c20.tar.gz chromium_src-f4b67d7f795db27a8e0835c5f254be1be6ce7c20.tar.bz2 | |
Content settings UI for mouse lock
BUG=97768
TEST=Preferences / Under the hood / Content Settings / Mouse Lock should exist and function similar to Location
Review URL: http://codereview.chromium.org/8549011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 36 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 3704548..82815fc 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -332,6 +332,7 @@ bool HostContentSettingsMap::IsSettingAllowedForType( case CONTENT_SETTINGS_TYPE_GEOLOCATION: case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: case CONTENT_SETTINGS_TYPE_INTENTS: + case CONTENT_SETTINGS_TYPE_MOUSELOCK: return setting == CONTENT_SETTING_ASK; default: return false; diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html index f0fed81..6d735f3 100644 --- a/chrome/browser/resources/options/content_settings.html +++ b/chrome/browser/resources/options/content_settings.html @@ -219,6 +219,32 @@ i18n-content="manage_exceptions"></button> </div> </section> + <!-- Mouse Lock filter --> + <section> + <h3 i18n-content="mouselock_tab_label"></h3> + <div> + <div class="radio"> + <label> + <input type="radio" name="mouselock" value="allow"> + <span i18n-content="mouselock_allow"></span> + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="mouselock" value="ask"> + <span i18n-content="mouselock_ask"></span> + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="mouselock" value="block"> + <span i18n-content="mouselock_block"></span> + </label> + </div> + <button class="exceptions-list-button" contentType="mouselock" + i18n-content="manage_exceptions"></button> + </div> + </section> <!-- Intent registration filter tab contents --> <if expr="pp_ifdef('enable_web_intents')"> <section id="intents-section"> diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.html b/chrome/browser/resources/options/content_settings_exceptions_area.html index 7e77104..4e95c04 100644 --- a/chrome/browser/resources/options/content_settings_exceptions_area.html +++ b/chrome/browser/resources/options/content_settings_exceptions_area.html @@ -67,4 +67,7 @@ <list mode="otr"></list> </div> </div> + <div contentType="mouselock"> + <list mode="normal"></list> + </div> </div> diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index aad3d0e..4fe3e9b 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -266,6 +266,12 @@ void ContentSettingsHandler::GetLocalizedValues( // Fullscreen filter. { "fullscreen_tab_label", IDS_FULLSCREEN_TAB_LABEL }, { "fullscreen_header", IDS_FULLSCREEN_HEADER }, + // Mouse Lock filter. + { "mouselock_tab_label", IDS_MOUSE_LOCK_TAB_LABEL }, + { "mouselock_header", IDS_MOUSE_LOCK_HEADER }, + { "mouselock_allow", IDS_MOUSE_LOCK_ALLOW_RADIO }, + { "mouselock_ask", IDS_MOUSE_LOCK_ASK_RADIO }, + { "mouselock_block", IDS_MOUSE_LOCK_BLOCK_RADIO }, }; RegisterStrings(localized_strings, resources, arraysize(resources)); @@ -416,9 +422,6 @@ void ContentSettingsHandler::UpdateAllExceptionsViewsFromModel() { // for this content type and we skip it here. if (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE) continue; - // TODO(scheib): Mouse lock content settings UI. http://crbug.com/97768 - if (type == CONTENT_SETTINGS_TYPE_MOUSELOCK) - continue; UpdateExceptionsViewFromModel(static_cast<ContentSettingsType>(type)); } } |