OLD | NEW |
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" | 5 #import "remoting/host/disconnect_window_mac.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 std::string client_jid = client_session_control->client_jid(); | 69 std::string client_jid = client_session_control->client_jid(); |
70 std::string username = client_jid.substr(0, client_jid.find('/')); | 70 std::string username = client_jid.substr(0, client_jid.find('/')); |
71 window_controller_ = | 71 window_controller_ = |
72 [[DisconnectWindowController alloc] initWithCallback:disconnect_callback | 72 [[DisconnectWindowController alloc] initWithCallback:disconnect_callback |
73 username:username]; | 73 username:username]; |
74 [window_controller_ showWindow:nil]; | 74 [window_controller_ showWindow:nil]; |
75 } | 75 } |
76 | 76 |
77 // static | 77 // static |
78 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { | 78 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() { |
79 return base::WrapUnique(new DisconnectWindowMac()); | 79 return base::MakeUnique<DisconnectWindowMac>(); |
80 } | 80 } |
81 | 81 |
82 } // namespace remoting | 82 } // namespace remoting |
83 | 83 |
84 @implementation DisconnectWindowController | 84 @implementation DisconnectWindowController |
85 - (id)initWithCallback:(const base::Closure&)disconnect_callback | 85 - (id)initWithCallback:(const base::Closure&)disconnect_callback |
86 username:(const std::string&)username { | 86 username:(const std::string&)username { |
87 self = [super initWithWindowNibName:@"disconnect_window"]; | 87 self = [super initWithWindowNibName:@"disconnect_window"]; |
88 if (self) { | 88 if (self) { |
89 disconnect_callback_ = disconnect_callback; | 89 disconnect_callback_ = disconnect_callback; |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 path = [NSBezierPath bezierPath]; | 285 path = [NSBezierPath bezierPath]; |
286 [path moveToPoint:top]; | 286 [path moveToPoint:top]; |
287 [path lineToPoint:bottom]; | 287 [path lineToPoint:bottom]; |
288 [light setStroke]; | 288 [light setStroke]; |
289 [path stroke]; | 289 [path stroke]; |
290 | 290 |
291 [context setShouldAntialias:alias]; | 291 [context setShouldAntialias:alias]; |
292 } | 292 } |
293 | 293 |
294 @end | 294 @end |
OLD | NEW |