| 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/content_settings/chrome_content_settings_utils.h" | 7 #include "chrome/browser/content_settings/chrome_content_settings_utils.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_tabstrip.h" | 9 #include "chrome/browser/ui/browser_tabstrip.h" |
| 10 #include "chrome/browser/ui/chrome_pages.h" | 10 #include "chrome/browser/ui/chrome_pages.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); | 46 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); |
| 47 return; | 47 return; |
| 48 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: | 48 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: |
| 49 // If the user requested to see the settings page for both camera | 49 // If the user requested to see the settings page for both camera |
| 50 // and microphone, point them to the default settings instead of | 50 // and microphone, point them to the default settings instead of |
| 51 // exceptions, as camera and microphone exceptions are now in two | 51 // exceptions, as camera and microphone exceptions are now in two |
| 52 // different overlays. Specifically, point them to the microphone | 52 // different overlays. Specifically, point them to the microphone |
| 53 // default settings, as those appear first in the list. | 53 // default settings, as those appear first in the list. |
| 54 chrome::ShowContentSettings( | 54 chrome::ShowContentSettings( |
| 55 browser_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); | 55 browser_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); |
| 56 return; |
| 56 default: | 57 default: |
| 57 chrome::ShowContentSettingsExceptions(browser_, type); | 58 chrome::ShowContentSettingsExceptions(browser_, type); |
| 58 return; | 59 return; |
| 59 } | 60 } |
| 60 } | 61 } |
| 61 | 62 |
| 62 void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage( | 63 void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage( |
| 63 ContentSettingsType type) { | 64 ContentSettingsType type) { |
| 64 if (type != CONTENT_SETTINGS_TYPE_PLUGINS) | 65 if (type != CONTENT_SETTINGS_TYPE_PLUGINS) |
| 65 return; | 66 return; |
| 66 chrome::AddSelectedTabWithURL(browser_, | 67 chrome::AddSelectedTabWithURL(browser_, |
| 67 GURL(chrome::kBlockedPluginLearnMoreURL), | 68 GURL(chrome::kBlockedPluginLearnMoreURL), |
| 68 ui::PAGE_TRANSITION_LINK); | 69 ui::PAGE_TRANSITION_LINK); |
| 69 } | 70 } |
| OLD | NEW |