| Index: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
|
| diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
|
| index 866b2e9bda553956ad0d5df28278e424a75e139a..5f50334706ffae5d5f183b5b90cc7ba17ef4d469 100644
|
| --- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
|
| +++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
|
| @@ -31,24 +31,23 @@ void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog(
|
|
|
| void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage(
|
| ContentSettingsType type) {
|
| - if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
|
| - // We don't (yet?) implement user-settable exceptions for mixed script
|
| - // blocking, so bounce to an explanatory page for now.
|
| - GURL url(google_util::AppendGoogleLocaleParam(
|
| - GURL(kInsecureScriptHelpUrl)));
|
| - chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK);
|
| - return;
|
| + switch (type) {
|
| + case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
|
| + // We don't (yet?) implement user-settable exceptions for mixed script
|
| + // blocking, so bounce to an explanatory page for now.
|
| + chrome::AddSelectedTabWithURL(
|
| + browser_,
|
| + google_util::AppendGoogleLocaleParam(GURL(kInsecureScriptHelpUrl)),
|
| + content::PAGE_TRANSITION_LINK);
|
| + return;
|
| + case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
|
| + chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
|
| + return;
|
| + case CONTENT_SETTINGS_TYPE_SAVE_PASSWORD:
|
| + chrome::ShowSettingsSubPage(browser_, chrome::kPasswordManagerSubPage);
|
| + return;
|
| + default:
|
| + chrome::ShowContentSettings(browser_, type);
|
| + return;
|
| }
|
| -
|
| - if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
|
| - chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
|
| - return;
|
| - }
|
| -
|
| - if (type == CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
|
| - chrome::ShowSettingsSubPage(browser_, chrome::kPasswordManagerSubPage);
|
| - return;
|
| - }
|
| -
|
| - chrome::ShowContentSettings(browser_, type);
|
| }
|
|
|