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 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #import <AppKit/AppKit.h> | 9 #import <AppKit/AppKit.h> |
| 10 | 10 |
| (...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1130 void WebsiteSettingsUIBridge::set_bubble_controller( | 1130 void WebsiteSettingsUIBridge::set_bubble_controller( |
| 1131 WebsiteSettingsBubbleController* controller) { | 1131 WebsiteSettingsBubbleController* controller) { |
| 1132 bubble_controller_ = controller; | 1132 bubble_controller_ = controller; |
| 1133 } | 1133 } |
| 1134 | 1134 |
| 1135 void WebsiteSettingsUIBridge::Show(gfx::NativeWindow parent, | 1135 void WebsiteSettingsUIBridge::Show(gfx::NativeWindow parent, |
| 1136 Profile* profile, | 1136 Profile* profile, |
| 1137 TabContents* tab_contents, | 1137 TabContents* tab_contents, |
| 1138 const GURL& url, | 1138 const GURL& url, |
| 1139 const content::SSLStatus& ssl) { | 1139 const content::SSLStatus& ssl) { |
| 1140 bool is_internal_page = url.SchemeIs(chrome::kChromeInternalScheme) || | 1140 bool is_internal_page = url.SchemeIs(chrome::kChromeInternalScheme) || |
|
tfarina
2012/09/24 19:19:03
Why InternalChromePage is not used here?
markusheintz_
2012/09/24 19:21:02
InternalChromePage should be used here as well. Pl
| |
| 1141 url.SchemeIs(chrome::kChromeUIScheme); | 1141 url.SchemeIs(chrome::kChromeUIScheme) || |
| 1142 url.SchemeIs(chrome::kExtensionScheme); | |
| 1142 | 1143 |
| 1143 // Create the bridge. This will be owned by the bubble controller. | 1144 // Create the bridge. This will be owned by the bubble controller. |
| 1144 WebsiteSettingsUIBridge* bridge = new WebsiteSettingsUIBridge(); | 1145 WebsiteSettingsUIBridge* bridge = new WebsiteSettingsUIBridge(); |
| 1145 | 1146 |
| 1146 // Create the bubble controller. It will dealloc itself when it closes. | 1147 // Create the bubble controller. It will dealloc itself when it closes. |
| 1147 WebsiteSettingsBubbleController* bubble_controller = | 1148 WebsiteSettingsBubbleController* bubble_controller = |
| 1148 [[WebsiteSettingsBubbleController alloc] initWithParentWindow:parent | 1149 [[WebsiteSettingsBubbleController alloc] initWithParentWindow:parent |
| 1149 websiteSettingsUIBridge:bridge | 1150 websiteSettingsUIBridge:bridge |
| 1150 tabContents:tab_contents | 1151 tabContents:tab_contents |
| 1151 isInternalPage:is_internal_page]; | 1152 isInternalPage:is_internal_page]; |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 1182 [bubble_controller_ setPermissionInfo:permission_info_list]; | 1183 [bubble_controller_ setPermissionInfo:permission_info_list]; |
| 1183 } | 1184 } |
| 1184 | 1185 |
| 1185 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) { | 1186 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) { |
| 1186 [bubble_controller_ setFirstVisit:first_visit]; | 1187 [bubble_controller_ setFirstVisit:first_visit]; |
| 1187 } | 1188 } |
| 1188 | 1189 |
| 1189 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { | 1190 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { |
| 1190 [bubble_controller_ setSelectedTab:tab_id]; | 1191 [bubble_controller_ setSelectedTab:tab_id]; |
| 1191 } | 1192 } |
| OLD | NEW |