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

Side by Side Diff: remoting/host/local_input_monitor_linux.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 (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/local_input_monitor.h" 5 #include "remoting/host/local_input_monitor.h"
6 6
7 #include <sys/select.h> 7 #include <sys/select.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 #define XK_MISCELLANY 9 #define XK_MISCELLANY
10 #include <X11/keysymdef.h> 10 #include <X11/keysymdef.h>
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 base::WeakPtr<ClientSessionControl> client_session_control) 123 base::WeakPtr<ClientSessionControl> client_session_control)
124 : caller_task_runner_(caller_task_runner), 124 : caller_task_runner_(caller_task_runner),
125 input_task_runner_(input_task_runner), 125 input_task_runner_(input_task_runner),
126 client_session_control_(client_session_control), 126 client_session_control_(client_session_control),
127 alt_pressed_(false), 127 alt_pressed_(false),
128 ctrl_pressed_(false), 128 ctrl_pressed_(false),
129 display_(NULL), 129 display_(NULL),
130 x_record_display_(NULL), 130 x_record_display_(NULL),
131 x_record_context_(0) { 131 x_record_context_(0) {
132 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 132 DCHECK(caller_task_runner_->BelongsToCurrentThread());
133 DCHECK(client_session_control_); 133 DCHECK(client_session_control_.get());
134 134
135 x_record_range_[0] = NULL; 135 x_record_range_[0] = NULL;
136 x_record_range_[1] = NULL; 136 x_record_range_[1] = NULL;
137 } 137 }
138 138
139 void LocalInputMonitorLinux::Core::Start() { 139 void LocalInputMonitorLinux::Core::Start() {
140 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 140 DCHECK(caller_task_runner_->BelongsToCurrentThread());
141 141
142 input_task_runner_->PostTask(FROM_HERE, 142 input_task_runner_->PostTask(FROM_HERE,
143 base::Bind(&Core::StartOnInputThread, this)); 143 base::Bind(&Core::StartOnInputThread, this));
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 323 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
324 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 324 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
325 base::WeakPtr<ClientSessionControl> client_session_control) { 325 base::WeakPtr<ClientSessionControl> client_session_control) {
326 return scoped_ptr<LocalInputMonitor>( 326 return scoped_ptr<LocalInputMonitor>(
327 new LocalInputMonitorLinux(caller_task_runner, 327 new LocalInputMonitorLinux(caller_task_runner,
328 input_task_runner, 328 input_task_runner,
329 client_session_control)); 329 client_session_control));
330 } 330 }
331 331
332 } // namespace remoting 332 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698