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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

Issue 1986953003: MacViews: move site settings bubble behind WebUIDialogs feature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/website_settings_bubble_contro ller.h" 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 WebsiteSettingsBubbleController* controller) { 1108 WebsiteSettingsBubbleController* controller) {
1109 bubble_controller_ = controller; 1109 bubble_controller_ = controller;
1110 } 1110 }
1111 1111
1112 void WebsiteSettingsUIBridge::Show( 1112 void WebsiteSettingsUIBridge::Show(
1113 gfx::NativeWindow parent, 1113 gfx::NativeWindow parent,
1114 Profile* profile, 1114 Profile* profile,
1115 content::WebContents* web_contents, 1115 content::WebContents* web_contents,
1116 const GURL& url, 1116 const GURL& url,
1117 const security_state::SecurityStateModel::SecurityInfo& security_info) { 1117 const security_state::SecurityStateModel::SecurityInfo& security_info) {
1118 if (chrome::ToolkitViewsDialogsEnabled()) { 1118 if (chrome::ToolkitViewsWebUIDialogsEnabled()) {
1119 chrome::ShowWebsiteSettingsBubbleViewsAtPoint( 1119 chrome::ShowWebsiteSettingsBubbleViewsAtPoint(
1120 gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile, 1120 gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
1121 web_contents, url, security_info); 1121 web_contents, url, security_info);
1122 return; 1122 return;
1123 } 1123 }
1124 1124
1125 BubbleType bubble_type = WEB_PAGE; 1125 BubbleType bubble_type = WEB_PAGE;
1126 if (url.SchemeIs(content::kChromeUIScheme)) 1126 if (url.SchemeIs(content::kChromeUIScheme))
1127 bubble_type = INTERNAL_PAGE; 1127 bubble_type = INTERNAL_PAGE;
1128 else if (url.SchemeIs(extensions::kExtensionScheme)) 1128 else if (url.SchemeIs(extensions::kExtensionScheme))
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 void WebsiteSettingsUIBridge::SetPermissionInfo( 1176 void WebsiteSettingsUIBridge::SetPermissionInfo(
1177 const PermissionInfoList& permission_info_list, 1177 const PermissionInfoList& permission_info_list,
1178 const ChosenObjectInfoList& chosen_object_info_list) { 1178 const ChosenObjectInfoList& chosen_object_info_list) {
1179 [bubble_controller_ setPermissionInfo:permission_info_list 1179 [bubble_controller_ setPermissionInfo:permission_info_list
1180 andChosenObjects:chosen_object_info_list]; 1180 andChosenObjects:chosen_object_info_list];
1181 } 1181 }
1182 1182
1183 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1183 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1184 // TODO(lgarron): Remove this from the interface. (crbug.com/571533) 1184 // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
1185 } 1185 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698