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

Side by Side Diff: remoting/host/disconnect_window_mac.mm

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU 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
« no previous file with comments | « remoting/host/disconnect_window_linux.cc ('k') | remoting/host/disconnect_window_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "remoting/host/disconnect_window_mac.h"
6
5 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
6 8
7 #import "remoting/host/disconnect_window_mac.h"
8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/sys_string_conversions.h" 16 #include "base/strings/sys_string_conversions.h"
16 #include "remoting/base/string_resources.h" 17 #include "remoting/base/string_resources.h"
17 #include "remoting/host/client_session_control.h" 18 #include "remoting/host/client_session_control.h"
18 #include "remoting/host/host_window.h" 19 #include "remoting/host/host_window.h"
19 #include "ui/base/l10n/l10n_util_mac.h" 20 #include "ui/base/l10n/l10n_util_mac.h"
20 21
21 @interface DisconnectWindowController() 22 @interface DisconnectWindowController()
22 - (BOOL)isRToL; 23 - (BOOL)isRToL;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 client_session_control, protocol::OK); 68 client_session_control, protocol::OK);
68 std::string client_jid = client_session_control->client_jid(); 69 std::string client_jid = client_session_control->client_jid();
69 std::string username = client_jid.substr(0, client_jid.find('/')); 70 std::string username = client_jid.substr(0, client_jid.find('/'));
70 window_controller_ = 71 window_controller_ =
71 [[DisconnectWindowController alloc] initWithCallback:disconnect_callback 72 [[DisconnectWindowController alloc] initWithCallback:disconnect_callback
72 username:username]; 73 username:username];
73 [window_controller_ showWindow:nil]; 74 [window_controller_ showWindow:nil];
74 } 75 }
75 76
76 // static 77 // static
77 scoped_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { 78 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() {
78 return make_scoped_ptr(new DisconnectWindowMac()); 79 return base::WrapUnique(new DisconnectWindowMac());
79 } 80 }
80 81
81 } // namespace remoting 82 } // namespace remoting
82 83
83 @implementation DisconnectWindowController 84 @implementation DisconnectWindowController
84 - (id)initWithCallback:(const base::Closure&)disconnect_callback 85 - (id)initWithCallback:(const base::Closure&)disconnect_callback
85 username:(const std::string&)username { 86 username:(const std::string&)username {
86 self = [super initWithWindowNibName:@"disconnect_window"]; 87 self = [super initWithWindowNibName:@"disconnect_window"];
87 if (self) { 88 if (self) {
88 disconnect_callback_ = disconnect_callback; 89 disconnect_callback_ = disconnect_callback;
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 path = [NSBezierPath bezierPath]; 285 path = [NSBezierPath bezierPath];
285 [path moveToPoint:top]; 286 [path moveToPoint:top];
286 [path lineToPoint:bottom]; 287 [path lineToPoint:bottom];
287 [light setStroke]; 288 [light setStroke];
288 [path stroke]; 289 [path stroke];
289 290
290 [context setShouldAntialias:alias]; 291 [context setShouldAntialias:alias];
291 } 292 }
292 293
293 @end 294 @end
OLDNEW
« no previous file with comments | « remoting/host/disconnect_window_linux.cc ('k') | remoting/host/disconnect_window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698