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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/browser_focus_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_dialogs.h" 8 #include "chrome/browser/ui/browser_dialogs.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 19 matching lines...) Expand all
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(browser_, 38 chrome::AddSelectedTabWithURL(browser_,
39 GURL(kInsecureScriptHelpUrl), 39 GURL(kInsecureScriptHelpUrl),
40 content::PAGE_TRANSITION_LINK); 40 ui::PAGE_TRANSITION_LINK);
41 return; 41 return;
42 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS: 42 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
43 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); 43 chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
44 return; 44 return;
45 default: 45 default:
46 chrome::ShowContentSettings(browser_, type); 46 chrome::ShowContentSettings(browser_, type);
47 return; 47 return;
48 } 48 }
49 } 49 }
50 50
51 void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage( 51 void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage(
52 ContentSettingsType type) { 52 ContentSettingsType type) {
53 if (type != CONTENT_SETTINGS_TYPE_PLUGINS) 53 if (type != CONTENT_SETTINGS_TYPE_PLUGINS)
54 return; 54 return;
55 chrome::AddSelectedTabWithURL(browser_, 55 chrome::AddSelectedTabWithURL(browser_,
56 GURL(chrome::kBlockedPluginLearnMoreURL), 56 GURL(chrome::kBlockedPluginLearnMoreURL),
57 content::PAGE_TRANSITION_LINK); 57 ui::PAGE_TRANSITION_LINK);
58 } 58 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/browser_focus_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698