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

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

Issue 20985002: Localized Chromoting Host on Mac and Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 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
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/plugin/constants.h » ('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 #include "remoting/host/me2me_desktop_environment.h" 5 #include "remoting/host/me2me_desktop_environment.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "remoting/host/client_session_control.h" 9 #include "remoting/host/client_session_control.h"
10 #include "remoting/host/curtain_mode.h" 10 #include "remoting/host/curtain_mode.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 58 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
59 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 59 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
60 : BasicDesktopEnvironment(caller_task_runner, 60 : BasicDesktopEnvironment(caller_task_runner,
61 input_task_runner, 61 input_task_runner,
62 ui_task_runner) { 62 ui_task_runner) {
63 DCHECK(caller_task_runner->BelongsToCurrentThread()); 63 DCHECK(caller_task_runner->BelongsToCurrentThread());
64 } 64 }
65 65
66 bool Me2MeDesktopEnvironment::InitializeSecurity( 66 bool Me2MeDesktopEnvironment::InitializeSecurity(
67 base::WeakPtr<ClientSessionControl> client_session_control, 67 base::WeakPtr<ClientSessionControl> client_session_control,
68 const UiStrings& ui_strings,
69 bool curtain_enabled) { 68 bool curtain_enabled) {
70 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 69 DCHECK(caller_task_runner()->BelongsToCurrentThread());
71 70
72 // Detach the session from the local console if the caller requested. 71 // Detach the session from the local console if the caller requested.
73 if (curtain_enabled) { 72 if (curtain_enabled) {
74 curtain_ = CurtainMode::Create(caller_task_runner(), 73 curtain_ = CurtainMode::Create(caller_task_runner(),
75 ui_task_runner(), 74 ui_task_runner(),
76 client_session_control); 75 client_session_control);
77 bool active = curtain_->Activate(); 76 bool active = curtain_->Activate();
78 if (!active) 77 if (!active)
(...skipping 20 matching lines...) Expand all
99 #endif // defined(OS_WIN) 98 #endif // defined(OS_WIN)
100 99
101 // Create the disconnect window. 100 // Create the disconnect window.
102 if (want_user_interface) { 101 if (want_user_interface) {
103 // Create the local input monitor. 102 // Create the local input monitor.
104 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner(), 103 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner(),
105 input_task_runner(), 104 input_task_runner(),
106 ui_task_runner(), 105 ui_task_runner(),
107 client_session_control); 106 client_session_control);
108 107
109 disconnect_window_ = HostWindow::CreateDisconnectWindow(ui_strings); 108 disconnect_window_ = HostWindow::CreateDisconnectWindow();
110 disconnect_window_.reset(new HostWindowProxy( 109 disconnect_window_.reset(new HostWindowProxy(
111 caller_task_runner(), 110 caller_task_runner(),
112 ui_task_runner(), 111 ui_task_runner(),
113 disconnect_window_.Pass())); 112 disconnect_window_.Pass()));
114 disconnect_window_->Start(client_session_control); 113 disconnect_window_->Start(client_session_control);
115 } 114 }
116 115
117 return true; 116 return true;
118 } 117 }
119 118
120 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( 119 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory(
121 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 120 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
122 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 121 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
123 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 122 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
124 const UiStrings& ui_strings)
125 : BasicDesktopEnvironmentFactory(caller_task_runner, 123 : BasicDesktopEnvironmentFactory(caller_task_runner,
126 input_task_runner, 124 input_task_runner,
127 ui_task_runner, 125 ui_task_runner),
128 ui_strings),
129 curtain_enabled_(false) { 126 curtain_enabled_(false) {
130 } 127 }
131 128
132 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { 129 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() {
133 } 130 }
134 131
135 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( 132 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
136 base::WeakPtr<ClientSessionControl> client_session_control) { 133 base::WeakPtr<ClientSessionControl> client_session_control) {
137 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 134 DCHECK(caller_task_runner()->BelongsToCurrentThread());
138 135
139 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( 136 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment(
140 new Me2MeDesktopEnvironment(caller_task_runner(), 137 new Me2MeDesktopEnvironment(caller_task_runner(),
141 input_task_runner(), 138 input_task_runner(),
142 ui_task_runner())); 139 ui_task_runner()));
143 if (!desktop_environment->InitializeSecurity(client_session_control, 140 if (!desktop_environment->InitializeSecurity(client_session_control,
144 ui_strings(),
145 curtain_enabled_)) { 141 curtain_enabled_)) {
146 return scoped_ptr<DesktopEnvironment>(); 142 return scoped_ptr<DesktopEnvironment>();
147 } 143 }
148 144
149 return desktop_environment.PassAs<DesktopEnvironment>(); 145 return desktop_environment.PassAs<DesktopEnvironment>();
150 } 146 }
151 147
152 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { 148 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
153 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 149 DCHECK(caller_task_runner()->BelongsToCurrentThread());
154 150
155 curtain_enabled_ = enable; 151 curtain_enabled_ = enable;
156 } 152 }
157 153
158 } // namespace remoting 154 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/plugin/constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698