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

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

Issue 11886051: Turned UiStrings into a singleton so that the continue window does not depend on ChromotingHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback Created 7 years, 11 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) 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/desktop_session_agent.h" 5 #include "remoting/host/desktop_session_agent.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ipc/ipc_channel_proxy.h" 8 #include "ipc/ipc_channel_proxy.h"
9 #include "ipc/ipc_message.h" 9 #include "ipc/ipc_message.h"
10 #include "ipc/ipc_message_macros.h" 10 #include "ipc/ipc_message_macros.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 // Start the event executor. 189 // Start the event executor.
190 scoped_ptr<protocol::ClipboardStub> clipboard_stub( 190 scoped_ptr<protocol::ClipboardStub> clipboard_stub(
191 new DesktopSesssionClipboardStub(this)); 191 new DesktopSesssionClipboardStub(this));
192 event_executor_->Start(clipboard_stub.Pass()); 192 event_executor_->Start(clipboard_stub.Pass());
193 193
194 base::Closure disconnect_session = 194 base::Closure disconnect_session =
195 base::Bind(&DesktopSessionAgent::DisconnectSession, this); 195 base::Bind(&DesktopSessionAgent::DisconnectSession, this);
196 196
197 // Create the disconnect window. 197 // Create the disconnect window.
198 disconnect_window_ = DisconnectWindow::Create(); 198 disconnect_window_ = DisconnectWindow::Create(&ui_strings_);
199 disconnect_window_->Show( 199 disconnect_window_->Show(
200 ui_strings_, disconnect_session, 200 disconnect_session,
201 authenticated_jid.substr(0, authenticated_jid.find('/'))); 201 authenticated_jid.substr(0, authenticated_jid.find('/')));
202 202
203 // Start monitoring local input. 203 // Start monitoring local input.
204 local_input_monitor_ = LocalInputMonitor::Create(); 204 local_input_monitor_ = LocalInputMonitor::Create();
205 local_input_monitor_->Start(this, disconnect_session); 205 local_input_monitor_->Start(this, disconnect_session);
206 206
207 // Start the audio capturer. 207 // Start the audio capturer.
208 audio_capture_task_runner()->PostTask( 208 audio_capture_task_runner()->PostTask(
209 FROM_HERE, base::Bind(&DesktopSessionAgent::StartAudioCapturer, this)); 209 FROM_HERE, base::Bind(&DesktopSessionAgent::StartAudioCapturer, this));
210 210
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 input_task_runner_(input_task_runner), 514 input_task_runner_(input_task_runner),
515 io_task_runner_(io_task_runner), 515 io_task_runner_(io_task_runner),
516 video_capture_task_runner_(video_capture_task_runner), 516 video_capture_task_runner_(video_capture_task_runner),
517 current_size_(SkISize::Make(0, 0)), 517 current_size_(SkISize::Make(0, 0)),
518 next_shared_buffer_id_(1), 518 next_shared_buffer_id_(1),
519 started_(false) { 519 started_(false) {
520 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 520 DCHECK(caller_task_runner_->BelongsToCurrentThread());
521 } 521 }
522 522
523 } // namespace remoting 523 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698