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

Side by Side Diff: remoting/host/desktop_environment.h

Issue 7714026: Fixed continue window bugs and added 60s auto-shutdown timeout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deactivate 60s timer if the user opts to continue. Created 9 years, 4 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // the connection. 98 // the connection.
99 scoped_ptr<ContinueWindow> continue_window_; 99 scoped_ptr<ContinueWindow> continue_window_;
100 100
101 // Monitor local inputs to allow remote inputs to be blocked while the local 101 // Monitor local inputs to allow remote inputs to be blocked while the local
102 // user is trying to do something. 102 // user is trying to do something.
103 scoped_ptr<LocalInputMonitor> local_input_monitor_; 103 scoped_ptr<LocalInputMonitor> local_input_monitor_;
104 104
105 bool is_monitoring_local_inputs_; 105 bool is_monitoring_local_inputs_;
106 106
107 // Timer controlling the "continue session" dialog. 107 // Timer controlling the "continue session" dialog.
108 bool continue_timer_started_; 108 enum {INACTIVE, SHOW_DIALOG, HIDE_DIALOG} continue_timer_state_;
Sergey Ulanov 2011/08/24 01:56:45 This is not very readable. Please define type Cont
Jamie 2011/08/24 17:42:03 Done. I've also renamed HIDE_DIALOG to SHUTDOWN_HO
109 base::Time continue_timer_target_time_; 109 base::Time continue_timer_target_time_;
110 110
111 scoped_refptr<UIThreadProxy> proxy_; 111 scoped_refptr<UIThreadProxy> proxy_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment); 113 DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
114 }; 114 };
115 115
116 } // namespace remoting 116 } // namespace remoting
117 117
118 #endif // REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ 118 #endif // REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698