Chromium Code Reviews| 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/browser_tabstrip.h" |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 ~BrowserContentSettingBubbleModelDelegate() { | 24 ~BrowserContentSettingBubbleModelDelegate() { |
| 25 } | 25 } |
| 26 | 26 |
| 27 void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog( | 27 void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog( |
| 28 content::WebContents* web_contents) { | 28 content::WebContents* web_contents) { |
| 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 if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { | 34 if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { |
|
Peter Kasting
2013/09/09 18:19:02
Nit: Consider converting these conditionals to a s
npentrel
2013/09/09 22:08:34
That would mean creating a lot of cases where noth
Peter Kasting
2013/09/10 00:22:11
? How so?
switch (type) {
case CONTENT_SETTING
npentrel
2013/09/10 16:46:38
Done.
| |
| 35 // We don't (yet?) implement user-settable exceptions for mixed script | 35 // We don't (yet?) implement user-settable exceptions for mixed script |
| 36 // blocking, so bounce to an explanatory page for now. | 36 // blocking, so bounce to an explanatory page for now. |
| 37 GURL url(google_util::AppendGoogleLocaleParam( | 37 GURL url(google_util::AppendGoogleLocaleParam( |
| 38 GURL(kInsecureScriptHelpUrl))); | 38 GURL(kInsecureScriptHelpUrl))); |
| 39 chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK); | 39 chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK); |
| 40 return; | 40 return; |
| 41 } | 41 } |
| 42 | 42 |
| 43 if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) { | 43 if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) { |
| 44 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); | 44 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); |
| 45 return; | 45 return; |
| 46 } | 46 } |
| 47 | 47 |
| 48 if (type == CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) { | |
| 49 chrome::ShowSettingsSubPage(browser_, chrome::kPasswordManagerSubPage); | |
| 50 return; | |
| 51 } | |
| 52 | |
| 48 chrome::ShowContentSettings(browser_, type); | 53 chrome::ShowContentSettings(browser_, type); |
| 49 } | 54 } |
| OLD | NEW |