Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5764)

Unified Diff: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Repair merge Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c2a7cf71b5f2208d4206a7581a2790cfe375f3d7..1afbaff159f00c25d5d5e8354f14f1b43a4017f7 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.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.
@@ -35,7 +36,13 @@ void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage(
GURL url(google_util::AppendGoogleLocaleParam(
GURL(kInsecureScriptHelpUrl)));
browser_->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK);
- } else {
- chrome::ShowContentSettings(browser_, type);
+ return;
}
+
+ if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
+ chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
+ return;
+ }
+
+ chrome::ShowContentSettings(browser_, type);
}

Powered by Google App Engine
This is Rietveld 408576698