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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 private: | 48 private: |
49 base::scoped_nsobject<ContinueWindowMacController> controller_; | 49 base::scoped_nsobject<ContinueWindowMacController> controller_; |
50 | 50 |
51 DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac); | 51 DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac); |
52 }; | 52 }; |
53 | 53 |
54 ContinueWindowMac::ContinueWindowMac() { | 54 ContinueWindowMac::ContinueWindowMac() { |
55 } | 55 } |
56 | 56 |
57 ContinueWindowMac::~ContinueWindowMac() { | 57 ContinueWindowMac::~ContinueWindowMac() { |
58 DCHECK(CalledOnValidThread()); | 58 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
59 } | 59 } |
60 | 60 |
61 void ContinueWindowMac::ShowUi() { | 61 void ContinueWindowMac::ShowUi() { |
62 DCHECK(CalledOnValidThread()); | 62 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
63 | 63 |
64 base::mac::ScopedNSAutoreleasePool pool; | 64 base::mac::ScopedNSAutoreleasePool pool; |
65 controller_.reset( | 65 controller_.reset( |
66 [[ContinueWindowMacController alloc] initWithWindow:this]); | 66 [[ContinueWindowMacController alloc] initWithWindow:this]); |
67 [controller_ show]; | 67 [controller_ show]; |
68 } | 68 } |
69 | 69 |
70 void ContinueWindowMac::HideUi() { | 70 void ContinueWindowMac::HideUi() { |
71 DCHECK(CalledOnValidThread()); | 71 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
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::MakeUnique<ContinueWindowMac>(); | 79 return base::MakeUnique<ContinueWindowMac>(); |
80 } | 80 } |
81 | 81 |
(...skipping 76 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 |