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

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

Issue 10782038: Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
===================================================================
--- 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);
}
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698