OLD | NEW |
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> |
| 8 |
7 #include <cmath> | 9 #include <cmath> |
8 | 10 |
9 #import <AppKit/AppKit.h> | |
10 | |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/mac/bind_objc_block.h" | 12 #include "base/mac/bind_objc_block.h" |
| 13 #include "base/memory/ptr_util.h" |
13 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/sys_string_conversions.h" | 15 #include "base/strings/sys_string_conversions.h" |
15 #import "chrome/browser/certificate_viewer.h" | 16 #import "chrome/browser/certificate_viewer.h" |
16 #include "chrome/browser/devtools/devtools_toggle_action.h" | 17 #include "chrome/browser/devtools/devtools_toggle_action.h" |
17 #include "chrome/browser/devtools/devtools_window.h" | 18 #include "chrome/browser/devtools/devtools_window.h" |
18 #include "chrome/browser/infobars/infobar_service.h" | 19 #include "chrome/browser/infobars/infobar_service.h" |
19 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/ui/browser_dialogs.h" | 21 #include "chrome/browser/ui/browser_dialogs.h" |
21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 22 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
22 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 23 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
(...skipping 21 matching lines...) Expand all Loading... |
44 #include "ui/base/cocoa/cocoa_base_utils.h" | 45 #include "ui/base/cocoa/cocoa_base_utils.h" |
45 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" | 46 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" |
46 #import "ui/base/cocoa/flipped_view.h" | 47 #import "ui/base/cocoa/flipped_view.h" |
47 #import "ui/base/cocoa/hover_image_button.h" | 48 #import "ui/base/cocoa/hover_image_button.h" |
48 #include "ui/base/l10n/l10n_util.h" | 49 #include "ui/base/l10n/l10n_util.h" |
49 #include "ui/base/resource/resource_bundle.h" | 50 #include "ui/base/resource/resource_bundle.h" |
50 #import "ui/gfx/mac/coordinate_conversion.h" | 51 #import "ui/gfx/mac/coordinate_conversion.h" |
51 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 52 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
52 #include "ui/resources/grit/ui_resources.h" | 53 #include "ui/resources/grit/ui_resources.h" |
53 | 54 |
54 using ChosenObjectInfoPtr = scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>; | 55 using ChosenObjectInfoPtr = |
| 56 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>; |
55 using ChosenObjectDeleteCallback = | 57 using ChosenObjectDeleteCallback = |
56 base::Callback<void(const WebsiteSettingsUI::ChosenObjectInfo&)>; | 58 base::Callback<void(const WebsiteSettingsUI::ChosenObjectInfo&)>; |
57 | 59 |
58 namespace { | 60 namespace { |
59 | 61 |
60 // The default width of the window, in view coordinates. It may be larger to | 62 // The default width of the window, in view coordinates. It may be larger to |
61 // fit the content. | 63 // fit the content. |
62 const CGFloat kDefaultWindowWidth = 310; | 64 const CGFloat kDefaultWindowWidth = 310; |
63 | 65 |
64 // Padding between the window frame and content. | 66 // Padding between the window frame and content. |
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 for (const auto& permission : permissionInfoList) { | 1065 for (const auto& permission : permissionInfoList) { |
1064 controlOrigin.y += kPermissionsTabSpacing; | 1066 controlOrigin.y += kPermissionsTabSpacing; |
1065 NSPoint rowBottomRight = [self addPermission:permission | 1067 NSPoint rowBottomRight = [self addPermission:permission |
1066 toView:permissionsView_ | 1068 toView:permissionsView_ |
1067 atPoint:controlOrigin]; | 1069 atPoint:controlOrigin]; |
1068 controlOrigin.y = rowBottomRight.y; | 1070 controlOrigin.y = rowBottomRight.y; |
1069 } | 1071 } |
1070 | 1072 |
1071 for (auto object : chosenObjectInfoList) { | 1073 for (auto object : chosenObjectInfoList) { |
1072 controlOrigin.y += kPermissionsTabSpacing; | 1074 controlOrigin.y += kPermissionsTabSpacing; |
1073 NSPoint rowBottomRight = [self addChosenObject:make_scoped_ptr(object) | 1075 NSPoint rowBottomRight = [self addChosenObject:base::WrapUnique(object) |
1074 toView:permissionsView_ | 1076 toView:permissionsView_ |
1075 atPoint:controlOrigin]; | 1077 atPoint:controlOrigin]; |
1076 controlOrigin.y = rowBottomRight.y; | 1078 controlOrigin.y = rowBottomRight.y; |
1077 } | 1079 } |
1078 | 1080 |
1079 controlOrigin.y += kFramePadding; | 1081 controlOrigin.y += kFramePadding; |
1080 } | 1082 } |
1081 | 1083 |
1082 [permissionsView_ setFrameSize: | 1084 [permissionsView_ setFrameSize: |
1083 NSMakeSize(NSWidth([permissionsView_ frame]), controlOrigin.y)]; | 1085 NSMakeSize(NSWidth([permissionsView_ frame]), controlOrigin.y)]; |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 void WebsiteSettingsUIBridge::SetPermissionInfo( | 1165 void WebsiteSettingsUIBridge::SetPermissionInfo( |
1164 const PermissionInfoList& permission_info_list, | 1166 const PermissionInfoList& permission_info_list, |
1165 const ChosenObjectInfoList& chosen_object_info_list) { | 1167 const ChosenObjectInfoList& chosen_object_info_list) { |
1166 [bubble_controller_ setPermissionInfo:permission_info_list | 1168 [bubble_controller_ setPermissionInfo:permission_info_list |
1167 andChosenObjects:chosen_object_info_list]; | 1169 andChosenObjects:chosen_object_info_list]; |
1168 } | 1170 } |
1169 | 1171 |
1170 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { | 1172 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { |
1171 // TODO(lgarron): Remove this from the interface. (crbug.com/571533) | 1173 // TODO(lgarron): Remove this from the interface. (crbug.com/571533) |
1172 } | 1174 } |
OLD | NEW |