| Index: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc (revision 147078)
|
| +++ chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc (working copy)
|
| @@ -9,7 +9,6 @@
|
| #include "chrome/browser/ui/browser_dialogs.h"
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| -#include "chrome/common/url_constants.h"
|
|
|
| // The URL for when the user clicks "learn more" on the mixed scripting page
|
| // icon bubble.
|
| @@ -37,13 +36,7 @@
|
| GURL url(google_util::AppendGoogleLocaleParam(
|
| GURL(kInsecureScriptHelpUrl)));
|
| chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK);
|
| - return;
|
| + } else {
|
| + chrome::ShowContentSettings(browser_, type);
|
| }
|
| -
|
| - if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
|
| - chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
|
| - return;
|
| - }
|
| -
|
| - chrome::ShowContentSettings(browser_, type);
|
| }
|
|
|