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

Side by Side Diff: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

Issue 325963007: Do not append Google locale to help center links (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" 5 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
6 6
7 #include "chrome/browser/google/google_util.h" 7 #include "chrome/browser/google/google_util.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_dialogs.h" 9 #include "chrome/browser/ui/browser_dialogs.h"
10 #include "chrome/browser/ui/browser_tabstrip.h" 10 #include "chrome/browser/ui/browser_tabstrip.h"
(...skipping 18 matching lines...) Expand all
29 chrome::ShowCollectedCookiesDialog(web_contents); 29 chrome::ShowCollectedCookiesDialog(web_contents);
30 } 30 }
31 31
32 void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( 32 void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage(
33 ContentSettingsType type) { 33 ContentSettingsType type) {
34 switch (type) { 34 switch (type) {
35 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT: 35 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
36 // We don't (yet?) implement user-settable exceptions for mixed script 36 // We don't (yet?) implement user-settable exceptions for mixed script
37 // blocking, so bounce to an explanatory page for now. 37 // blocking, so bounce to an explanatory page for now.
38 chrome::AddSelectedTabWithURL( 38 chrome::AddSelectedTabWithURL(
39 browser_, 39 browser_,
Peter Kasting 2014/06/10 18:58:25 Nit: This can now go on the end of the previous li
blundell 2014/06/11 12:07:19 Done.
40 google_util::AppendGoogleLocaleParam(GURL(kInsecureScriptHelpUrl)), 40 GURL(kInsecureScriptHelpUrl),
41 content::PAGE_TRANSITION_LINK); 41 content::PAGE_TRANSITION_LINK);
42 return; 42 return;
43 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS: 43 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
44 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); 44 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
45 return; 45 return;
46 default: 46 default:
47 chrome::ShowContentSettings(browser_, type); 47 chrome::ShowContentSettings(browser_, type);
48 return; 48 return;
49 } 49 }
50 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698