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

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

Issue 10447041: Fix Ctrl+Alt+Esc keyboard shortcut in Me2Me host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « remoting/host/host_mock_objects.h ('k') | remoting/host/host_user_interface.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef REMOTING_HOST_HOST_USER_INTERFACE_H_ 5 #ifndef REMOTING_HOST_HOST_USER_INTERFACE_H_
6 #define REMOTING_HOST_HOST_USER_INTERFACE_H_ 6 #define REMOTING_HOST_HOST_USER_INTERFACE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 13 matching lines...) Expand all
24 class SignalStrategy; 24 class SignalStrategy;
25 25
26 class HostUserInterface : public HostStatusObserver { 26 class HostUserInterface : public HostStatusObserver {
27 public: 27 public:
28 HostUserInterface(ChromotingHostContext* context); 28 HostUserInterface(ChromotingHostContext* context);
29 virtual ~HostUserInterface(); 29 virtual ~HostUserInterface();
30 30
31 virtual void Start(ChromotingHost* host, 31 virtual void Start(ChromotingHost* host,
32 const base::Closure& disconnect_callback); 32 const base::Closure& disconnect_callback);
33 33
34 // TODO(sergeyu): Disconnect shortcut is disabled with Me2Me on Mac
35 // because it didn't work properly. Fix and remove this hack.
36 // http://crbug.com/129684
37 void DisableDisconnectShortcutOnMac();
38
39 // HostStatusObserver implementation. These methods will be called from the 34 // HostStatusObserver implementation. These methods will be called from the
40 // network thread. 35 // network thread.
41 virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE; 36 virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
42 virtual void OnClientDisconnected(const std::string& jid) OVERRIDE; 37 virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
43 virtual void OnAccessDenied(const std::string& jid) OVERRIDE; 38 virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
44 virtual void OnShutdown() OVERRIDE; 39 virtual void OnShutdown() OVERRIDE;
45 40
46 protected: 41 protected:
47 const std::string& get_authenticated_jid() const { 42 const std::string& get_authenticated_jid() const {
48 return authenticated_jid_; 43 return authenticated_jid_;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 scoped_ptr<DisconnectWindow> disconnect_window_; 90 scoped_ptr<DisconnectWindow> disconnect_window_;
96 91
97 // Monitor local inputs to allow remote inputs to be blocked while the local 92 // Monitor local inputs to allow remote inputs to be blocked while the local
98 // user is trying to do something. 93 // user is trying to do something.
99 scoped_ptr<LocalInputMonitor> local_input_monitor_; 94 scoped_ptr<LocalInputMonitor> local_input_monitor_;
100 95
101 bool is_monitoring_local_inputs_; 96 bool is_monitoring_local_inputs_;
102 97
103 ScopedThreadProxy ui_thread_proxy_; 98 ScopedThreadProxy ui_thread_proxy_;
104 99
105 bool disable_disconnect_shortcut_on_mac_;
106
107 DISALLOW_COPY_AND_ASSIGN(HostUserInterface); 100 DISALLOW_COPY_AND_ASSIGN(HostUserInterface);
108 }; 101 };
109 102
110 } // namespace remoting 103 } // namespace remoting
111 104
112 #endif // REMOTING_HOST_HOST_USER_INTERFACE_H_ 105 #endif // REMOTING_HOST_HOST_USER_INTERFACE_H_
OLDNEW
« no previous file with comments | « remoting/host/host_mock_objects.h ('k') | remoting/host/host_user_interface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698