Index: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm |
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm |
index b9c93daa4f16f29a7c37d3c71581c5d98d89f9b0..83ff13c8b713dd47ff2b90c94a41d5e3b20eebf7 100644 |
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm |
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm |
@@ -4,12 +4,13 @@ |
#import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h" |
-#include <cmath> |
- |
#import <AppKit/AppKit.h> |
+#include <cmath> |
+ |
#include "base/i18n/rtl.h" |
#include "base/mac/bind_objc_block.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/sys_string_conversions.h" |
#import "chrome/browser/certificate_viewer.h" |
@@ -51,7 +52,8 @@ |
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
#include "ui/resources/grit/ui_resources.h" |
-using ChosenObjectInfoPtr = scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>; |
+using ChosenObjectInfoPtr = |
+ std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>; |
using ChosenObjectDeleteCallback = |
base::Callback<void(const WebsiteSettingsUI::ChosenObjectInfo&)>; |
@@ -1070,7 +1072,7 @@ NSPoint AnchorPointForWindow(NSWindow* parent) { |
for (auto object : chosenObjectInfoList) { |
controlOrigin.y += kPermissionsTabSpacing; |
- NSPoint rowBottomRight = [self addChosenObject:make_scoped_ptr(object) |
+ NSPoint rowBottomRight = [self addChosenObject:base::WrapUnique(object) |
toView:permissionsView_ |
atPoint:controlOrigin]; |
controlOrigin.y = rowBottomRight.y; |