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 #include "remoting/host/continue_window.h" | 5 #include "remoting/host/continue_window.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 | 69 |
70 void ContinueWindowMac::HideUi() { | 70 void ContinueWindowMac::HideUi() { |
71 DCHECK(CalledOnValidThread()); | 71 DCHECK(CalledOnValidThread()); |
72 | 72 |
73 base::mac::ScopedNSAutoreleasePool pool; | 73 base::mac::ScopedNSAutoreleasePool pool; |
74 [controller_ hide]; | 74 [controller_ hide]; |
75 } | 75 } |
76 | 76 |
77 // static | 77 // static |
78 std::unique_ptr<HostWindow> HostWindow::CreateContinueWindow() { | 78 std::unique_ptr<HostWindow> HostWindow::CreateContinueWindow() { |
79 return base::WrapUnique(new ContinueWindowMac()); | 79 return base::MakeUnique<ContinueWindowMac>(); |
80 } | 80 } |
81 | 81 |
82 } // namespace remoting | 82 } // namespace remoting |
83 | 83 |
84 @implementation ContinueWindowMacController | 84 @implementation ContinueWindowMacController |
85 | 85 |
86 - (id)initWithWindow:(remoting::ContinueWindow*)continue_window { | 86 - (id)initWithWindow:(remoting::ContinueWindow*)continue_window { |
87 if ((self = [super init])) { | 87 if ((self = [super init])) { |
88 continue_window_ = continue_window; | 88 continue_window_ = continue_window; |
89 } | 89 } |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 [self hide]; | 158 [self hide]; |
159 continue_window_->DisconnectSession(); | 159 continue_window_->DisconnectSession(); |
160 } | 160 } |
161 | 161 |
162 - (void)onContinue:(id)sender { | 162 - (void)onContinue:(id)sender { |
163 [self hide]; | 163 [self hide]; |
164 continue_window_->ContinueSession(); | 164 continue_window_->ContinueSession(); |
165 } | 165 } |
166 | 166 |
167 @end | 167 @end |
OLD | NEW |