diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:34:49 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:34:49 +0000 |
| commit | 1da9241f59295147b68e4f3abe8dfb84f246e222 (patch) | |
| tree | 8ed4cc2eda7a09187959f6c0035170727803fd3f /chrome/browser/ui | |
| parent | a73b9c3984e77b06088c78e744400349231c0d8a (diff) | |
| download | chromium_src-1da9241f59295147b68e4f3abe8dfb84f246e222.zip chromium_src-1da9241f59295147b68e4f3abe8dfb84f246e222.tar.gz chromium_src-1da9241f59295147b68e4f3abe8dfb84f246e222.tar.bz2 | |
Handle web intents content settings update properly.
Don't update "normal" exceptions when command-line flag is not enabled.
Don't ever update OTR exceptions - you cannot register intents in OTR mode.
BUG=95477
TEST=none
Review URL: http://codereview.chromium.org/7831068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/options/content_settings_handler.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 33dc90c..62a7806 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -422,6 +422,12 @@ void ContentSettingsHandler::UpdateAllOTRExceptionsViewsFromModel() { void ContentSettingsHandler::UpdateExceptionsViewFromModel( ContentSettingsType type) { + // Skip updating intents unless it's enabled from the command line. + if (type == CONTENT_SETTINGS_TYPE_INTENTS && + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)) + return; + switch (type) { case CONTENT_SETTINGS_TYPE_GEOLOCATION: UpdateGeolocationExceptionsView(); @@ -440,6 +446,7 @@ void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel( switch (type) { case CONTENT_SETTINGS_TYPE_GEOLOCATION: case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: + case CONTENT_SETTINGS_TYPE_INTENTS: break; default: UpdateExceptionsViewFromOTRHostContentSettingsMap(type); |