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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
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 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" 5 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 8 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
8 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h " 9 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h "
9 #import "chrome/browser/ui/website_settings/permission_bubble_view.h" 10 #import "chrome/browser/ui/website_settings/permission_bubble_view.h"
10 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
11 #import "ui/base/cocoa/nsview_additions.h" 12 #import "ui/base/cocoa/nsview_additions.h"
12 13
13 PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser) 14 PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser)
14 : browser_(browser), delegate_(nullptr), bubbleController_(nil) { 15 : browser_(browser), delegate_(nullptr), bubbleController_(nil) {
15 DCHECK(browser); 16 DCHECK(browser);
16 } 17 }
17 18
18 PermissionBubbleCocoa::~PermissionBubbleCocoa() { 19 PermissionBubbleCocoa::~PermissionBubbleCocoa() {
19 } 20 }
20 21
21 // static 22 // static
22 scoped_ptr<PermissionBubbleView> PermissionBubbleView::Create( 23 std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
23 Browser* browser) { 24 Browser* browser) {
24 return make_scoped_ptr(new PermissionBubbleCocoa(browser)); 25 return base::WrapUnique(new PermissionBubbleCocoa(browser));
25 } 26 }
26 27
27 void PermissionBubbleCocoa::Show( 28 void PermissionBubbleCocoa::Show(
28 const std::vector<PermissionBubbleRequest*>& requests, 29 const std::vector<PermissionBubbleRequest*>& requests,
29 const std::vector<bool>& accept_state) { 30 const std::vector<bool>& accept_state) {
30 if (!bubbleController_) { 31 if (!bubbleController_) {
31 bubbleController_ = 32 bubbleController_ =
32 [[PermissionBubbleController alloc] initWithBrowser:browser_ 33 [[PermissionBubbleController alloc] initWithBrowser:browser_
33 bridge:this]; 34 bridge:this];
34 } 35 }
(...skipping 25 matching lines...) Expand all
60 [bubbleController_ updateAnchorPosition]; 61 [bubbleController_ updateAnchorPosition];
61 } 62 }
62 63
63 gfx::NativeWindow PermissionBubbleCocoa::GetNativeWindow() { 64 gfx::NativeWindow PermissionBubbleCocoa::GetNativeWindow() {
64 return [bubbleController_ window]; 65 return [bubbleController_ window];
65 } 66 }
66 67
67 void PermissionBubbleCocoa::OnBubbleClosing() { 68 void PermissionBubbleCocoa::OnBubbleClosing() {
68 bubbleController_ = nil; 69 bubbleController_ = nil;
69 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698