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

Side by Side Diff: remoting/host/continue_window.cc

Issue 15927028: Update remoting/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "base/location.h" 7 #include "base/location.h"
8 #include "remoting/host/client_session_control.h" 8 #include "remoting/host/client_session_control.h"
9 9
10 // Minutes before the local user should confirm that the session should go on. 10 // Minutes before the local user should confirm that the session should go on.
11 const int kSessionExpirationTimeoutMinutes = 10; 11 const int kSessionExpirationTimeoutMinutes = 10;
12 12
13 // Minutes before the session will be disconnected (from the moment the Continue 13 // Minutes before the session will be disconnected (from the moment the Continue
14 // window has been shown). 14 // window has been shown).
15 const int kSessionDisconnectTimeoutMinutes = 1; 15 const int kSessionDisconnectTimeoutMinutes = 1;
16 16
17 namespace remoting { 17 namespace remoting {
18 18
19 ContinueWindow::~ContinueWindow() { 19 ContinueWindow::~ContinueWindow() {
20 } 20 }
21 21
22 void ContinueWindow::Start( 22 void ContinueWindow::Start(
23 const base::WeakPtr<ClientSessionControl>& client_session_control) { 23 const base::WeakPtr<ClientSessionControl>& client_session_control) {
24 DCHECK(CalledOnValidThread()); 24 DCHECK(CalledOnValidThread());
25 DCHECK(!client_session_control_); 25 DCHECK(!client_session_control_.get());
26 DCHECK(client_session_control); 26 DCHECK(client_session_control.get());
27 27
28 client_session_control_ = client_session_control; 28 client_session_control_ = client_session_control;
29 29
30 session_expired_timer_.Start( 30 session_expired_timer_.Start(
31 FROM_HERE, base::TimeDelta::FromMinutes(kSessionExpirationTimeoutMinutes), 31 FROM_HERE, base::TimeDelta::FromMinutes(kSessionExpirationTimeoutMinutes),
32 this, &ContinueWindow::OnSessionExpired); 32 this, &ContinueWindow::OnSessionExpired);
33 } 33 }
34 34
35 void ContinueWindow::ContinueSession() { 35 void ContinueWindow::ContinueSession() {
36 DCHECK(CalledOnValidThread()); 36 DCHECK(CalledOnValidThread());
37 37
38 disconnect_timer_.Stop(); 38 disconnect_timer_.Stop();
39 39
40 if (!client_session_control_) 40 if (!client_session_control_.get())
41 return; 41 return;
42 42
43 // Hide the Continue window and resume the session. 43 // Hide the Continue window and resume the session.
44 HideUi(); 44 HideUi();
45 client_session_control_->SetDisableInputs(false); 45 client_session_control_->SetDisableInputs(false);
46 46
47 session_expired_timer_.Start( 47 session_expired_timer_.Start(
48 FROM_HERE, base::TimeDelta::FromMinutes(kSessionExpirationTimeoutMinutes), 48 FROM_HERE, base::TimeDelta::FromMinutes(kSessionExpirationTimeoutMinutes),
49 this, &ContinueWindow::OnSessionExpired); 49 this, &ContinueWindow::OnSessionExpired);
50 } 50 }
51 51
52 void ContinueWindow::DisconnectSession() { 52 void ContinueWindow::DisconnectSession() {
53 DCHECK(CalledOnValidThread()); 53 DCHECK(CalledOnValidThread());
54 54
55 disconnect_timer_.Stop(); 55 disconnect_timer_.Stop();
56 if (client_session_control_) 56 if (client_session_control_.get())
57 client_session_control_->DisconnectSession(); 57 client_session_control_->DisconnectSession();
58 } 58 }
59 59
60 ContinueWindow::ContinueWindow(const UiStrings& ui_strings) 60 ContinueWindow::ContinueWindow(const UiStrings& ui_strings)
61 : ui_strings_(ui_strings) { 61 : ui_strings_(ui_strings) {
62 } 62 }
63 63
64 void ContinueWindow::OnSessionExpired() { 64 void ContinueWindow::OnSessionExpired() {
65 DCHECK(CalledOnValidThread()); 65 DCHECK(CalledOnValidThread());
66 66
67 if (!client_session_control_) 67 if (!client_session_control_.get())
68 return; 68 return;
69 69
70 // Stop the remote input while the Continue window is shown. 70 // Stop the remote input while the Continue window is shown.
71 client_session_control_->SetDisableInputs(true); 71 client_session_control_->SetDisableInputs(true);
72 72
73 // Show the Continue window and wait for the local user input. 73 // Show the Continue window and wait for the local user input.
74 ShowUi(); 74 ShowUi();
75 disconnect_timer_.Start( 75 disconnect_timer_.Start(
76 FROM_HERE, base::TimeDelta::FromMinutes(kSessionDisconnectTimeoutMinutes), 76 FROM_HERE, base::TimeDelta::FromMinutes(kSessionDisconnectTimeoutMinutes),
77 this, &ContinueWindow::DisconnectSession); 77 this, &ContinueWindow::DisconnectSession);
78 } 78 }
79 79
80 } // namespace remoting 80 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698