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

Side by Side Diff: chrome/browser/ui/cocoa/confirm_bubble_controller.mm

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 (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/confirm_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h"
6 6
7 #include <utility>
8
7 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
8 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 10 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
9 #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" 11 #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h"
10 #import "chrome/browser/ui/confirm_bubble_model.h" 12 #import "chrome/browser/ui/confirm_bubble_model.h"
11 #include "ui/gfx/geometry/point.h" 13 #include "ui/gfx/geometry/point.h"
12 #include "ui/gfx/image/image.h" 14 #include "ui/gfx/image/image.h"
13 15
14 @implementation ConfirmBubbleController 16 @implementation ConfirmBubbleController
15 17
16 - (id)initWithParent:(NSView*)parent 18 - (id)initWithParent:(NSView*)parent
17 origin:(CGPoint)origin 19 origin:(CGPoint)origin
18 model:(scoped_ptr<ConfirmBubbleModel>)model { 20 model:(scoped_ptr<ConfirmBubbleModel>)model {
19 if ((self = [super initWithNibName:nil bundle:nil])) { 21 if ((self = [super initWithNibName:nil bundle:nil])) {
20 parent_ = parent; 22 parent_ = parent;
21 origin_ = origin; 23 origin_ = origin;
22 model_ = model.Pass(); 24 model_ = std::move(model);
23 } 25 }
24 return self; 26 return self;
25 } 27 }
26 28
27 - (void)loadView { 29 - (void)loadView {
28 [self setView:[[[ConfirmBubbleCocoa alloc] initWithParent:parent_ 30 [self setView:[[[ConfirmBubbleCocoa alloc] initWithParent:parent_
29 controller:self] autorelease]]; 31 controller:self] autorelease]];
30 } 32 }
31 33
32 - (void)windowWillClose:(NSNotification*)notification { 34 - (void)windowWillClose:(NSNotification*)notification {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 82
81 - (void)cancel { 83 - (void)cancel {
82 model_->Cancel(); 84 model_->Cancel();
83 } 85 }
84 86
85 - (void)linkClicked { 87 - (void)linkClicked {
86 model_->LinkClicked(); 88 model_->LinkClicked();
87 } 89 }
88 90
89 @end 91 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm ('k') | chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698