OLD | NEW |
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/chrome_pages.h" | 11 #include "chrome/browser/ui/chrome_pages.h" |
11 | 12 |
12 // The URL for when the user clicks "learn more" on the mixed scripting page | 13 // The URL for when the user clicks "learn more" on the mixed scripting page |
13 // icon bubble. | 14 // icon bubble. |
14 const char kInsecureScriptHelpUrl[] = | 15 const char kInsecureScriptHelpUrl[] = |
15 "https://support.google.com/chrome/bin/answer.py?answer=1342714"; | 16 "https://support.google.com/chrome/bin/answer.py?answer=1342714"; |
16 | 17 |
17 BrowserContentSettingBubbleModelDelegate:: | 18 BrowserContentSettingBubbleModelDelegate:: |
18 BrowserContentSettingBubbleModelDelegate(Browser* browser) : browser_(browser) { | 19 BrowserContentSettingBubbleModelDelegate(Browser* browser) : browser_(browser) { |
19 } | 20 } |
20 | 21 |
21 BrowserContentSettingBubbleModelDelegate:: | 22 BrowserContentSettingBubbleModelDelegate:: |
22 ~BrowserContentSettingBubbleModelDelegate() { | 23 ~BrowserContentSettingBubbleModelDelegate() { |
23 } | 24 } |
24 | 25 |
25 void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog( | 26 void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog( |
26 TabContents* contents) { | 27 TabContents* contents) { |
27 browser::ShowCollectedCookiesDialog(contents); | 28 browser::ShowCollectedCookiesDialog(contents); |
28 } | 29 } |
29 | 30 |
30 void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( | 31 void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( |
31 ContentSettingsType type) { | 32 ContentSettingsType type) { |
32 if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { | 33 if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { |
33 // We don't (yet?) implement user-settable exceptions for mixed script | 34 // We don't (yet?) implement user-settable exceptions for mixed script |
34 // blocking, so bounce to an explanatory page for now. | 35 // blocking, so bounce to an explanatory page for now. |
35 GURL url(google_util::AppendGoogleLocaleParam( | 36 GURL url(google_util::AppendGoogleLocaleParam( |
36 GURL(kInsecureScriptHelpUrl))); | 37 GURL(kInsecureScriptHelpUrl))); |
37 browser_->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK); | 38 chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK); |
38 } else { | 39 } else { |
39 chrome::ShowContentSettings(browser_, type); | 40 chrome::ShowContentSettings(browser_, type); |
40 } | 41 } |
41 } | 42 } |
OLD | NEW |