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

Side by Side Diff: components/arc/arc_bridge_service.cc

Issue 1885683005: Add module suffix in .mojom files for components/arc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase only Created 4 years, 8 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
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/arc/arc_bridge_service.h" 5 #include "components/arc/arc_bridge_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/sequenced_task_runner.h" 10 #include "base/sequenced_task_runner.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 observer->OnProcessInstanceReady(); 86 observer->OnProcessInstanceReady();
87 if (video_instance()) 87 if (video_instance())
88 observer->OnVideoInstanceReady(); 88 observer->OnVideoInstanceReady();
89 } 89 }
90 90
91 void ArcBridgeService::RemoveObserver(Observer* observer) { 91 void ArcBridgeService::RemoveObserver(Observer* observer) {
92 DCHECK(CalledOnValidThread()); 92 DCHECK(CalledOnValidThread());
93 observer_list_.RemoveObserver(observer); 93 observer_list_.RemoveObserver(observer);
94 } 94 }
95 95
96 void ArcBridgeService::OnAppInstanceReady(AppInstancePtr app_ptr) { 96 void ArcBridgeService::OnAppInstanceReady(mojom::AppInstancePtr app_ptr) {
97 DCHECK(CalledOnValidThread()); 97 DCHECK(CalledOnValidThread());
98 temporary_app_ptr_ = std::move(app_ptr); 98 temporary_app_ptr_ = std::move(app_ptr);
99 temporary_app_ptr_.QueryVersion(base::Bind( 99 temporary_app_ptr_.QueryVersion(base::Bind(
100 &ArcBridgeService::OnAppVersionReady, weak_factory_.GetWeakPtr())); 100 &ArcBridgeService::OnAppVersionReady, weak_factory_.GetWeakPtr()));
101 } 101 }
102 102
103 void ArcBridgeService::OnAppVersionReady(int32_t version) { 103 void ArcBridgeService::OnAppVersionReady(int32_t version) {
104 DCHECK(CalledOnValidThread()); 104 DCHECK(CalledOnValidThread());
105 app_ptr_ = std::move(temporary_app_ptr_); 105 app_ptr_ = std::move(temporary_app_ptr_);
106 app_ptr_.set_connection_error_handler(base::Bind( 106 app_ptr_.set_connection_error_handler(base::Bind(
107 &ArcBridgeService::CloseAppChannel, weak_factory_.GetWeakPtr())); 107 &ArcBridgeService::CloseAppChannel, weak_factory_.GetWeakPtr()));
108 FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceReady()); 108 FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceReady());
109 } 109 }
110 110
111 void ArcBridgeService::CloseAppChannel() { 111 void ArcBridgeService::CloseAppChannel() {
112 DCHECK(CalledOnValidThread()); 112 DCHECK(CalledOnValidThread());
113 if (!app_ptr_) 113 if (!app_ptr_)
114 return; 114 return;
115 115
116 app_ptr_.reset(); 116 app_ptr_.reset();
117 FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceClosed()); 117 FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceClosed());
118 } 118 }
119 119
120 void ArcBridgeService::OnAudioInstanceReady(AudioInstancePtr audio_ptr) { 120 void ArcBridgeService::OnAudioInstanceReady(mojom::AudioInstancePtr audio_ptr) {
121 DCHECK(CalledOnValidThread()); 121 DCHECK(CalledOnValidThread());
122 temporary_audio_ptr_ = std::move(audio_ptr); 122 temporary_audio_ptr_ = std::move(audio_ptr);
123 temporary_audio_ptr_.QueryVersion(base::Bind( 123 temporary_audio_ptr_.QueryVersion(base::Bind(
124 &ArcBridgeService::OnAudioVersionReady, weak_factory_.GetWeakPtr())); 124 &ArcBridgeService::OnAudioVersionReady, weak_factory_.GetWeakPtr()));
125 } 125 }
126 126
127 void ArcBridgeService::OnAudioVersionReady(int32_t version) { 127 void ArcBridgeService::OnAudioVersionReady(int32_t version) {
128 DCHECK(CalledOnValidThread()); 128 DCHECK(CalledOnValidThread());
129 audio_ptr_ = std::move(temporary_audio_ptr_); 129 audio_ptr_ = std::move(temporary_audio_ptr_);
130 audio_ptr_.set_connection_error_handler(base::Bind( 130 audio_ptr_.set_connection_error_handler(base::Bind(
131 &ArcBridgeService::CloseAudioChannel, weak_factory_.GetWeakPtr())); 131 &ArcBridgeService::CloseAudioChannel, weak_factory_.GetWeakPtr()));
132 FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceReady()); 132 FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceReady());
133 } 133 }
134 134
135 void ArcBridgeService::CloseAudioChannel() { 135 void ArcBridgeService::CloseAudioChannel() {
136 if (!audio_ptr_) 136 if (!audio_ptr_)
137 return; 137 return;
138 138
139 audio_ptr_.reset(); 139 audio_ptr_.reset();
140 FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceClosed()); 140 FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceClosed());
141 } 141 }
142 142
143 void ArcBridgeService::OnAuthInstanceReady(AuthInstancePtr auth_ptr) { 143 void ArcBridgeService::OnAuthInstanceReady(mojom::AuthInstancePtr auth_ptr) {
144 DCHECK(CalledOnValidThread()); 144 DCHECK(CalledOnValidThread());
145 temporary_auth_ptr_ = std::move(auth_ptr); 145 temporary_auth_ptr_ = std::move(auth_ptr);
146 temporary_auth_ptr_.QueryVersion(base::Bind( 146 temporary_auth_ptr_.QueryVersion(base::Bind(
147 &ArcBridgeService::OnAuthVersionReady, weak_factory_.GetWeakPtr())); 147 &ArcBridgeService::OnAuthVersionReady, weak_factory_.GetWeakPtr()));
148 } 148 }
149 149
150 void ArcBridgeService::OnAuthVersionReady(int32_t version) { 150 void ArcBridgeService::OnAuthVersionReady(int32_t version) {
151 DCHECK(CalledOnValidThread()); 151 DCHECK(CalledOnValidThread());
152 auth_ptr_ = std::move(temporary_auth_ptr_); 152 auth_ptr_ = std::move(temporary_auth_ptr_);
153 auth_ptr_.set_connection_error_handler(base::Bind( 153 auth_ptr_.set_connection_error_handler(base::Bind(
154 &ArcBridgeService::CloseAuthChannel, weak_factory_.GetWeakPtr())); 154 &ArcBridgeService::CloseAuthChannel, weak_factory_.GetWeakPtr()));
155 FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceReady()); 155 FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceReady());
156 } 156 }
157 157
158 void ArcBridgeService::CloseAuthChannel() { 158 void ArcBridgeService::CloseAuthChannel() {
159 DCHECK(CalledOnValidThread()); 159 DCHECK(CalledOnValidThread());
160 if (!auth_ptr_) 160 if (!auth_ptr_)
161 return; 161 return;
162 162
163 auth_ptr_.reset(); 163 auth_ptr_.reset();
164 FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceClosed()); 164 FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceClosed());
165 } 165 }
166 166
167 void ArcBridgeService::OnBluetoothInstanceReady( 167 void ArcBridgeService::OnBluetoothInstanceReady(
168 BluetoothInstancePtr bluetooth_ptr) { 168 mojom::BluetoothInstancePtr bluetooth_ptr) {
169 DCHECK(CalledOnValidThread()); 169 DCHECK(CalledOnValidThread());
170 temporary_bluetooth_ptr_ = std::move(bluetooth_ptr); 170 temporary_bluetooth_ptr_ = std::move(bluetooth_ptr);
171 temporary_bluetooth_ptr_.QueryVersion(base::Bind( 171 temporary_bluetooth_ptr_.QueryVersion(base::Bind(
172 &ArcBridgeService::OnBluetoothVersionReady, weak_factory_.GetWeakPtr())); 172 &ArcBridgeService::OnBluetoothVersionReady, weak_factory_.GetWeakPtr()));
173 } 173 }
174 174
175 void ArcBridgeService::OnBluetoothVersionReady(int32_t version) { 175 void ArcBridgeService::OnBluetoothVersionReady(int32_t version) {
176 DCHECK(CalledOnValidThread()); 176 DCHECK(CalledOnValidThread());
177 bluetooth_ptr_ = std::move(temporary_bluetooth_ptr_); 177 bluetooth_ptr_ = std::move(temporary_bluetooth_ptr_);
178 bluetooth_ptr_.set_connection_error_handler(base::Bind( 178 bluetooth_ptr_.set_connection_error_handler(base::Bind(
179 &ArcBridgeService::CloseBluetoothChannel, weak_factory_.GetWeakPtr())); 179 &ArcBridgeService::CloseBluetoothChannel, weak_factory_.GetWeakPtr()));
180 FOR_EACH_OBSERVER(Observer, observer_list(), OnBluetoothInstanceReady()); 180 FOR_EACH_OBSERVER(Observer, observer_list(), OnBluetoothInstanceReady());
181 } 181 }
182 182
183 void ArcBridgeService::CloseBluetoothChannel() { 183 void ArcBridgeService::CloseBluetoothChannel() {
184 DCHECK(CalledOnValidThread()); 184 DCHECK(CalledOnValidThread());
185 if (!bluetooth_ptr_) 185 if (!bluetooth_ptr_)
186 return; 186 return;
187 187
188 bluetooth_ptr_.reset(); 188 bluetooth_ptr_.reset();
189 FOR_EACH_OBSERVER(Observer, observer_list(), OnBluetoothInstanceClosed()); 189 FOR_EACH_OBSERVER(Observer, observer_list(), OnBluetoothInstanceClosed());
190 } 190 }
191 191
192 void ArcBridgeService::OnClipboardInstanceReady( 192 void ArcBridgeService::OnClipboardInstanceReady(
193 ClipboardInstancePtr clipboard_ptr) { 193 mojom::ClipboardInstancePtr clipboard_ptr) {
194 DCHECK(CalledOnValidThread()); 194 DCHECK(CalledOnValidThread());
195 temporary_clipboard_ptr_ = std::move(clipboard_ptr); 195 temporary_clipboard_ptr_ = std::move(clipboard_ptr);
196 temporary_clipboard_ptr_.QueryVersion(base::Bind( 196 temporary_clipboard_ptr_.QueryVersion(base::Bind(
197 &ArcBridgeService::OnClipboardVersionReady, weak_factory_.GetWeakPtr())); 197 &ArcBridgeService::OnClipboardVersionReady, weak_factory_.GetWeakPtr()));
198 } 198 }
199 199
200 void ArcBridgeService::OnClipboardVersionReady(int32_t version) { 200 void ArcBridgeService::OnClipboardVersionReady(int32_t version) {
201 DCHECK(CalledOnValidThread()); 201 DCHECK(CalledOnValidThread());
202 clipboard_ptr_ = std::move(temporary_clipboard_ptr_); 202 clipboard_ptr_ = std::move(temporary_clipboard_ptr_);
203 clipboard_ptr_.set_connection_error_handler(base::Bind( 203 clipboard_ptr_.set_connection_error_handler(base::Bind(
204 &ArcBridgeService::CloseClipboardChannel, weak_factory_.GetWeakPtr())); 204 &ArcBridgeService::CloseClipboardChannel, weak_factory_.GetWeakPtr()));
205 FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceReady()); 205 FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceReady());
206 } 206 }
207 207
208 void ArcBridgeService::CloseClipboardChannel() { 208 void ArcBridgeService::CloseClipboardChannel() {
209 DCHECK(CalledOnValidThread()); 209 DCHECK(CalledOnValidThread());
210 if (!clipboard_ptr_) 210 if (!clipboard_ptr_)
211 return; 211 return;
212 212
213 clipboard_ptr_.reset(); 213 clipboard_ptr_.reset();
214 FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceClosed()); 214 FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceClosed());
215 } 215 }
216 216
217 void ArcBridgeService::OnCrashCollectorInstanceReady( 217 void ArcBridgeService::OnCrashCollectorInstanceReady(
218 CrashCollectorInstancePtr crash_collector_ptr) { 218 mojom::CrashCollectorInstancePtr crash_collector_ptr) {
219 DCHECK(CalledOnValidThread()); 219 DCHECK(CalledOnValidThread());
220 temporary_crash_collector_ptr_ = std::move(crash_collector_ptr); 220 temporary_crash_collector_ptr_ = std::move(crash_collector_ptr);
221 temporary_crash_collector_ptr_.QueryVersion( 221 temporary_crash_collector_ptr_.QueryVersion(
222 base::Bind(&ArcBridgeService::OnCrashCollectorVersionReady, 222 base::Bind(&ArcBridgeService::OnCrashCollectorVersionReady,
223 weak_factory_.GetWeakPtr())); 223 weak_factory_.GetWeakPtr()));
224 } 224 }
225 225
226 void ArcBridgeService::OnCrashCollectorVersionReady(int32_t version) { 226 void ArcBridgeService::OnCrashCollectorVersionReady(int32_t version) {
227 DCHECK(CalledOnValidThread()); 227 DCHECK(CalledOnValidThread());
228 crash_collector_ptr_ = std::move(temporary_crash_collector_ptr_); 228 crash_collector_ptr_ = std::move(temporary_crash_collector_ptr_);
229 crash_collector_ptr_.set_connection_error_handler( 229 crash_collector_ptr_.set_connection_error_handler(
230 base::Bind(&ArcBridgeService::CloseCrashCollectorChannel, 230 base::Bind(&ArcBridgeService::CloseCrashCollectorChannel,
231 weak_factory_.GetWeakPtr())); 231 weak_factory_.GetWeakPtr()));
232 FOR_EACH_OBSERVER(Observer, observer_list(), OnCrashCollectorInstanceReady()); 232 FOR_EACH_OBSERVER(Observer, observer_list(), OnCrashCollectorInstanceReady());
233 } 233 }
234 234
235 void ArcBridgeService::CloseCrashCollectorChannel() { 235 void ArcBridgeService::CloseCrashCollectorChannel() {
236 DCHECK(CalledOnValidThread()); 236 DCHECK(CalledOnValidThread());
237 if (!crash_collector_ptr_) 237 if (!crash_collector_ptr_)
238 return; 238 return;
239 239
240 crash_collector_ptr_.reset(); 240 crash_collector_ptr_.reset();
241 FOR_EACH_OBSERVER(Observer, observer_list(), 241 FOR_EACH_OBSERVER(Observer, observer_list(),
242 OnCrashCollectorInstanceClosed()); 242 OnCrashCollectorInstanceClosed());
243 } 243 }
244 244
245 void ArcBridgeService::OnImeInstanceReady(ImeInstancePtr ime_ptr) { 245 void ArcBridgeService::OnImeInstanceReady(mojom::ImeInstancePtr ime_ptr) {
246 DCHECK(CalledOnValidThread()); 246 DCHECK(CalledOnValidThread());
247 temporary_ime_ptr_ = std::move(ime_ptr); 247 temporary_ime_ptr_ = std::move(ime_ptr);
248 temporary_ime_ptr_.QueryVersion(base::Bind( 248 temporary_ime_ptr_.QueryVersion(base::Bind(
249 &ArcBridgeService::OnImeVersionReady, weak_factory_.GetWeakPtr())); 249 &ArcBridgeService::OnImeVersionReady, weak_factory_.GetWeakPtr()));
250 } 250 }
251 251
252 void ArcBridgeService::OnImeVersionReady(int32_t version) { 252 void ArcBridgeService::OnImeVersionReady(int32_t version) {
253 DCHECK(CalledOnValidThread()); 253 DCHECK(CalledOnValidThread());
254 ime_ptr_ = std::move(temporary_ime_ptr_); 254 ime_ptr_ = std::move(temporary_ime_ptr_);
255 ime_ptr_.set_connection_error_handler(base::Bind( 255 ime_ptr_.set_connection_error_handler(base::Bind(
256 &ArcBridgeService::CloseImeChannel, weak_factory_.GetWeakPtr())); 256 &ArcBridgeService::CloseImeChannel, weak_factory_.GetWeakPtr()));
257 FOR_EACH_OBSERVER(Observer, observer_list(), OnImeInstanceReady()); 257 FOR_EACH_OBSERVER(Observer, observer_list(), OnImeInstanceReady());
258 } 258 }
259 259
260 void ArcBridgeService::CloseImeChannel() { 260 void ArcBridgeService::CloseImeChannel() {
261 DCHECK(CalledOnValidThread()); 261 DCHECK(CalledOnValidThread());
262 if (!ime_ptr_) 262 if (!ime_ptr_)
263 return; 263 return;
264 264
265 ime_ptr_.reset(); 265 ime_ptr_.reset();
266 FOR_EACH_OBSERVER(Observer, observer_list(), OnImeInstanceClosed()); 266 FOR_EACH_OBSERVER(Observer, observer_list(), OnImeInstanceClosed());
267 } 267 }
268 268
269 void ArcBridgeService::OnInputInstanceReady(InputInstancePtr input_ptr) { 269 void ArcBridgeService::OnInputInstanceReady(mojom::InputInstancePtr input_ptr) {
270 DCHECK(CalledOnValidThread()); 270 DCHECK(CalledOnValidThread());
271 temporary_input_ptr_ = std::move(input_ptr); 271 temporary_input_ptr_ = std::move(input_ptr);
272 temporary_input_ptr_.QueryVersion(base::Bind( 272 temporary_input_ptr_.QueryVersion(base::Bind(
273 &ArcBridgeService::OnInputVersionReady, weak_factory_.GetWeakPtr())); 273 &ArcBridgeService::OnInputVersionReady, weak_factory_.GetWeakPtr()));
274 } 274 }
275 275
276 void ArcBridgeService::OnInputVersionReady(int32_t version) { 276 void ArcBridgeService::OnInputVersionReady(int32_t version) {
277 DCHECK(CalledOnValidThread()); 277 DCHECK(CalledOnValidThread());
278 input_ptr_ = std::move(temporary_input_ptr_); 278 input_ptr_ = std::move(temporary_input_ptr_);
279 input_ptr_.set_connection_error_handler(base::Bind( 279 input_ptr_.set_connection_error_handler(base::Bind(
280 &ArcBridgeService::CloseInputChannel, weak_factory_.GetWeakPtr())); 280 &ArcBridgeService::CloseInputChannel, weak_factory_.GetWeakPtr()));
281 FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceReady()); 281 FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceReady());
282 } 282 }
283 283
284 void ArcBridgeService::CloseInputChannel() { 284 void ArcBridgeService::CloseInputChannel() {
285 DCHECK(CalledOnValidThread()); 285 DCHECK(CalledOnValidThread());
286 if (!input_ptr_) 286 if (!input_ptr_)
287 return; 287 return;
288 288
289 input_ptr_.reset(); 289 input_ptr_.reset();
290 FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceClosed()); 290 FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceClosed());
291 } 291 }
292 292
293 void ArcBridgeService::OnIntentHelperInstanceReady( 293 void ArcBridgeService::OnIntentHelperInstanceReady(
294 IntentHelperInstancePtr intent_helper_ptr) { 294 mojom::IntentHelperInstancePtr intent_helper_ptr) {
295 DCHECK(CalledOnValidThread()); 295 DCHECK(CalledOnValidThread());
296 temporary_intent_helper_ptr_ = std::move(intent_helper_ptr); 296 temporary_intent_helper_ptr_ = std::move(intent_helper_ptr);
297 temporary_intent_helper_ptr_.QueryVersion( 297 temporary_intent_helper_ptr_.QueryVersion(
298 base::Bind(&ArcBridgeService::OnIntentHelperVersionReady, 298 base::Bind(&ArcBridgeService::OnIntentHelperVersionReady,
299 weak_factory_.GetWeakPtr())); 299 weak_factory_.GetWeakPtr()));
300 } 300 }
301 301
302 void ArcBridgeService::OnIntentHelperVersionReady(int32_t version) { 302 void ArcBridgeService::OnIntentHelperVersionReady(int32_t version) {
303 DCHECK(CalledOnValidThread()); 303 DCHECK(CalledOnValidThread());
304 intent_helper_ptr_ = std::move(temporary_intent_helper_ptr_); 304 intent_helper_ptr_ = std::move(temporary_intent_helper_ptr_);
305 intent_helper_ptr_.set_connection_error_handler(base::Bind( 305 intent_helper_ptr_.set_connection_error_handler(base::Bind(
306 &ArcBridgeService::CloseIntentHelperChannel, weak_factory_.GetWeakPtr())); 306 &ArcBridgeService::CloseIntentHelperChannel, weak_factory_.GetWeakPtr()));
307 FOR_EACH_OBSERVER(Observer, observer_list(), OnIntentHelperInstanceReady()); 307 FOR_EACH_OBSERVER(Observer, observer_list(), OnIntentHelperInstanceReady());
308 } 308 }
309 309
310 void ArcBridgeService::CloseIntentHelperChannel() { 310 void ArcBridgeService::CloseIntentHelperChannel() {
311 DCHECK(CalledOnValidThread()); 311 DCHECK(CalledOnValidThread());
312 if (!intent_helper_ptr_) 312 if (!intent_helper_ptr_)
313 return; 313 return;
314 314
315 intent_helper_ptr_.reset(); 315 intent_helper_ptr_.reset();
316 FOR_EACH_OBSERVER(Observer, observer_list(), OnIntentHelperInstanceClosed()); 316 FOR_EACH_OBSERVER(Observer, observer_list(), OnIntentHelperInstanceClosed());
317 } 317 }
318 318
319 void ArcBridgeService::OnNetInstanceReady(NetInstancePtr net_ptr) { 319 void ArcBridgeService::OnNetInstanceReady(mojom::NetInstancePtr net_ptr) {
320 DCHECK(CalledOnValidThread()); 320 DCHECK(CalledOnValidThread());
321 temporary_net_ptr_ = std::move(net_ptr); 321 temporary_net_ptr_ = std::move(net_ptr);
322 temporary_net_ptr_.QueryVersion(base::Bind( 322 temporary_net_ptr_.QueryVersion(base::Bind(
323 &ArcBridgeService::OnNetVersionReady, weak_factory_.GetWeakPtr())); 323 &ArcBridgeService::OnNetVersionReady, weak_factory_.GetWeakPtr()));
324 } 324 }
325 325
326 void ArcBridgeService::OnNetVersionReady(int32_t version) { 326 void ArcBridgeService::OnNetVersionReady(int32_t version) {
327 DCHECK(CalledOnValidThread()); 327 DCHECK(CalledOnValidThread());
328 net_ptr_ = std::move(temporary_net_ptr_); 328 net_ptr_ = std::move(temporary_net_ptr_);
329 net_ptr_.set_connection_error_handler(base::Bind( 329 net_ptr_.set_connection_error_handler(base::Bind(
330 &ArcBridgeService::CloseNetChannel, weak_factory_.GetWeakPtr())); 330 &ArcBridgeService::CloseNetChannel, weak_factory_.GetWeakPtr()));
331 FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceReady()); 331 FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceReady());
332 } 332 }
333 333
334 void ArcBridgeService::CloseNetChannel() { 334 void ArcBridgeService::CloseNetChannel() {
335 DCHECK(CalledOnValidThread()); 335 DCHECK(CalledOnValidThread());
336 if (!net_ptr_) 336 if (!net_ptr_)
337 return; 337 return;
338 338
339 net_ptr_.reset(); 339 net_ptr_.reset();
340 FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceClosed()); 340 FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceClosed());
341 } 341 }
342 342
343 void ArcBridgeService::OnNotificationsInstanceReady( 343 void ArcBridgeService::OnNotificationsInstanceReady(
344 NotificationsInstancePtr notifications_ptr) { 344 mojom::NotificationsInstancePtr notifications_ptr) {
345 DCHECK(CalledOnValidThread()); 345 DCHECK(CalledOnValidThread());
346 temporary_notifications_ptr_ = std::move(notifications_ptr); 346 temporary_notifications_ptr_ = std::move(notifications_ptr);
347 temporary_notifications_ptr_.QueryVersion( 347 temporary_notifications_ptr_.QueryVersion(
348 base::Bind(&ArcBridgeService::OnNotificationsVersionReady, 348 base::Bind(&ArcBridgeService::OnNotificationsVersionReady,
349 weak_factory_.GetWeakPtr())); 349 weak_factory_.GetWeakPtr()));
350 } 350 }
351 351
352 void ArcBridgeService::OnNotificationsVersionReady(int32_t version) { 352 void ArcBridgeService::OnNotificationsVersionReady(int32_t version) {
353 DCHECK(CalledOnValidThread()); 353 DCHECK(CalledOnValidThread());
354 notifications_ptr_ = std::move(temporary_notifications_ptr_); 354 notifications_ptr_ = std::move(temporary_notifications_ptr_);
355 notifications_ptr_.set_connection_error_handler( 355 notifications_ptr_.set_connection_error_handler(
356 base::Bind(&ArcBridgeService::CloseNotificationsChannel, 356 base::Bind(&ArcBridgeService::CloseNotificationsChannel,
357 weak_factory_.GetWeakPtr())); 357 weak_factory_.GetWeakPtr()));
358 FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceReady()); 358 FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceReady());
359 } 359 }
360 360
361 void ArcBridgeService::CloseNotificationsChannel() { 361 void ArcBridgeService::CloseNotificationsChannel() {
362 DCHECK(CalledOnValidThread()); 362 DCHECK(CalledOnValidThread());
363 if (!notifications_ptr_) 363 if (!notifications_ptr_)
364 return; 364 return;
365 365
366 notifications_ptr_.reset(); 366 notifications_ptr_.reset();
367 FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceClosed()); 367 FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceClosed());
368 } 368 }
369 369
370 void ArcBridgeService::OnPolicyInstanceReady(PolicyInstancePtr policy_ptr) { 370 void ArcBridgeService::OnPolicyInstanceReady(
371 mojom::PolicyInstancePtr policy_ptr) {
371 DCHECK(CalledOnValidThread()); 372 DCHECK(CalledOnValidThread());
372 temporary_policy_ptr_ = std::move(policy_ptr); 373 temporary_policy_ptr_ = std::move(policy_ptr);
373 temporary_policy_ptr_.QueryVersion(base::Bind( 374 temporary_policy_ptr_.QueryVersion(base::Bind(
374 &ArcBridgeService::OnPolicyVersionReady, weak_factory_.GetWeakPtr())); 375 &ArcBridgeService::OnPolicyVersionReady, weak_factory_.GetWeakPtr()));
375 } 376 }
376 377
377 void ArcBridgeService::OnPolicyVersionReady(int32_t version) { 378 void ArcBridgeService::OnPolicyVersionReady(int32_t version) {
378 DCHECK(CalledOnValidThread()); 379 DCHECK(CalledOnValidThread());
379 policy_ptr_ = std::move(temporary_policy_ptr_); 380 policy_ptr_ = std::move(temporary_policy_ptr_);
380 policy_ptr_.set_connection_error_handler(base::Bind( 381 policy_ptr_.set_connection_error_handler(base::Bind(
381 &ArcBridgeService::ClosePolicyChannel, weak_factory_.GetWeakPtr())); 382 &ArcBridgeService::ClosePolicyChannel, weak_factory_.GetWeakPtr()));
382 FOR_EACH_OBSERVER(Observer, observer_list(), OnPolicyInstanceReady()); 383 FOR_EACH_OBSERVER(Observer, observer_list(), OnPolicyInstanceReady());
383 } 384 }
384 385
385 void ArcBridgeService::ClosePolicyChannel() { 386 void ArcBridgeService::ClosePolicyChannel() {
386 DCHECK(CalledOnValidThread()); 387 DCHECK(CalledOnValidThread());
387 if (!policy_ptr_) 388 if (!policy_ptr_)
388 return; 389 return;
389 390
390 policy_ptr_.reset(); 391 policy_ptr_.reset();
391 FOR_EACH_OBSERVER(Observer, observer_list(), OnPolicyInstanceClosed()); 392 FOR_EACH_OBSERVER(Observer, observer_list(), OnPolicyInstanceClosed());
392 } 393 }
393 394
394 void ArcBridgeService::OnPowerInstanceReady(PowerInstancePtr power_ptr) { 395 void ArcBridgeService::OnPowerInstanceReady(mojom::PowerInstancePtr power_ptr) {
395 DCHECK(CalledOnValidThread()); 396 DCHECK(CalledOnValidThread());
396 temporary_power_ptr_ = std::move(power_ptr); 397 temporary_power_ptr_ = std::move(power_ptr);
397 temporary_power_ptr_.QueryVersion(base::Bind( 398 temporary_power_ptr_.QueryVersion(base::Bind(
398 &ArcBridgeService::OnPowerVersionReady, weak_factory_.GetWeakPtr())); 399 &ArcBridgeService::OnPowerVersionReady, weak_factory_.GetWeakPtr()));
399 } 400 }
400 401
401 void ArcBridgeService::OnPowerVersionReady(int32_t version) { 402 void ArcBridgeService::OnPowerVersionReady(int32_t version) {
402 DCHECK(CalledOnValidThread()); 403 DCHECK(CalledOnValidThread());
403 power_ptr_ = std::move(temporary_power_ptr_); 404 power_ptr_ = std::move(temporary_power_ptr_);
404 power_ptr_.set_connection_error_handler(base::Bind( 405 power_ptr_.set_connection_error_handler(base::Bind(
405 &ArcBridgeService::ClosePowerChannel, weak_factory_.GetWeakPtr())); 406 &ArcBridgeService::ClosePowerChannel, weak_factory_.GetWeakPtr()));
406 FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceReady()); 407 FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceReady());
407 } 408 }
408 409
409 void ArcBridgeService::ClosePowerChannel() { 410 void ArcBridgeService::ClosePowerChannel() {
410 DCHECK(CalledOnValidThread()); 411 DCHECK(CalledOnValidThread());
411 if (!power_ptr_) 412 if (!power_ptr_)
412 return; 413 return;
413 414
414 power_ptr_.reset(); 415 power_ptr_.reset();
415 FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceClosed()); 416 FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceClosed());
416 } 417 }
417 418
418 void ArcBridgeService::OnProcessInstanceReady(ProcessInstancePtr process_ptr) { 419 void ArcBridgeService::OnProcessInstanceReady(
420 mojom::ProcessInstancePtr process_ptr) {
419 DCHECK(CalledOnValidThread()); 421 DCHECK(CalledOnValidThread());
420 temporary_process_ptr_ = std::move(process_ptr); 422 temporary_process_ptr_ = std::move(process_ptr);
421 temporary_process_ptr_.QueryVersion(base::Bind( 423 temporary_process_ptr_.QueryVersion(base::Bind(
422 &ArcBridgeService::OnProcessVersionReady, weak_factory_.GetWeakPtr())); 424 &ArcBridgeService::OnProcessVersionReady, weak_factory_.GetWeakPtr()));
423 } 425 }
424 426
425 void ArcBridgeService::OnProcessVersionReady(int32_t version) { 427 void ArcBridgeService::OnProcessVersionReady(int32_t version) {
426 DCHECK(CalledOnValidThread()); 428 DCHECK(CalledOnValidThread());
427 process_ptr_ = std::move(temporary_process_ptr_); 429 process_ptr_ = std::move(temporary_process_ptr_);
428 process_ptr_.set_connection_error_handler(base::Bind( 430 process_ptr_.set_connection_error_handler(base::Bind(
429 &ArcBridgeService::CloseProcessChannel, weak_factory_.GetWeakPtr())); 431 &ArcBridgeService::CloseProcessChannel, weak_factory_.GetWeakPtr()));
430 FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceReady()); 432 FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceReady());
431 } 433 }
432 434
433 void ArcBridgeService::CloseProcessChannel() { 435 void ArcBridgeService::CloseProcessChannel() {
434 DCHECK(CalledOnValidThread()); 436 DCHECK(CalledOnValidThread());
435 if (!process_ptr_) 437 if (!process_ptr_)
436 return; 438 return;
437 439
438 process_ptr_.reset(); 440 process_ptr_.reset();
439 FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceClosed()); 441 FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceClosed());
440 } 442 }
441 443
442 void ArcBridgeService::OnVideoInstanceReady(VideoInstancePtr video_ptr) { 444 void ArcBridgeService::OnVideoInstanceReady(mojom::VideoInstancePtr video_ptr) {
443 DCHECK(CalledOnValidThread()); 445 DCHECK(CalledOnValidThread());
444 temporary_video_ptr_ = std::move(video_ptr); 446 temporary_video_ptr_ = std::move(video_ptr);
445 temporary_video_ptr_.QueryVersion(base::Bind( 447 temporary_video_ptr_.QueryVersion(base::Bind(
446 &ArcBridgeService::OnVideoVersionReady, weak_factory_.GetWeakPtr())); 448 &ArcBridgeService::OnVideoVersionReady, weak_factory_.GetWeakPtr()));
447 } 449 }
448 450
449 void ArcBridgeService::OnVideoVersionReady(int32_t version) { 451 void ArcBridgeService::OnVideoVersionReady(int32_t version) {
450 DCHECK(CalledOnValidThread()); 452 DCHECK(CalledOnValidThread());
451 video_ptr_ = std::move(temporary_video_ptr_); 453 video_ptr_ = std::move(temporary_video_ptr_);
452 video_ptr_.set_connection_error_handler(base::Bind( 454 video_ptr_.set_connection_error_handler(base::Bind(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 CloseIntentHelperChannel(); 498 CloseIntentHelperChannel();
497 CloseNetChannel(); 499 CloseNetChannel();
498 CloseNotificationsChannel(); 500 CloseNotificationsChannel();
499 ClosePolicyChannel(); 501 ClosePolicyChannel();
500 ClosePowerChannel(); 502 ClosePowerChannel();
501 CloseProcessChannel(); 503 CloseProcessChannel();
502 CloseVideoChannel(); 504 CloseVideoChannel();
503 } 505 }
504 506
505 } // namespace arc 507 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698