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

Side by Side Diff: components/pairing/bluetooth_host_pairing_controller.cc

Issue 2444753002: Reduce usage of FOR_EACH_OBSERVER macro in components/ (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/pairing/bluetooth_host_pairing_controller.h" 5 #include "components/pairing/bluetooth_host_pairing_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/hash.h" 8 #include "base/hash.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 scoped_refptr<device::BluetoothAdapter> 121 scoped_refptr<device::BluetoothAdapter>
122 BluetoothHostPairingController::GetAdapterForTesting() { 122 BluetoothHostPairingController::GetAdapterForTesting() {
123 return adapter_; 123 return adapter_;
124 } 124 }
125 125
126 void BluetoothHostPairingController::ChangeStage(Stage new_stage) { 126 void BluetoothHostPairingController::ChangeStage(Stage new_stage) {
127 if (current_stage_ == new_stage) 127 if (current_stage_ == new_stage)
128 return; 128 return;
129 VLOG(1) << "ChangeStage " << new_stage; 129 VLOG(1) << "ChangeStage " << new_stage;
130 current_stage_ = new_stage; 130 current_stage_ = new_stage;
131 FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage)); 131 for (Observer& observer : observers_)
132 observer.PairingStageChanged(new_stage);
132 } 133 }
133 134
134 void BluetoothHostPairingController::SendHostStatus() { 135 void BluetoothHostPairingController::SendHostStatus() {
135 pairing_api::HostStatus host_status; 136 pairing_api::HostStatus host_status;
136 137
137 host_status.set_api_version(kPairingAPIVersion); 138 host_status.set_api_version(kPairingAPIVersion);
138 if (!enrollment_domain_.empty()) 139 if (!enrollment_domain_.empty())
139 host_status.mutable_parameters()->set_domain(enrollment_domain_); 140 host_status.mutable_parameters()->set_domain(enrollment_domain_);
140 if (!permanent_id_.empty()) 141 if (!permanent_id_.empty())
141 host_status.mutable_parameters()->set_permanent_id(permanent_id_); 142 host_status.mutable_parameters()->set_permanent_id(permanent_id_);
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 } 378 }
378 379
379 void BluetoothHostPairingController::OnHostStatusMessage( 380 void BluetoothHostPairingController::OnHostStatusMessage(
380 const pairing_api::HostStatus& message) { 381 const pairing_api::HostStatus& message) {
381 NOTREACHED(); 382 NOTREACHED();
382 } 383 }
383 384
384 void BluetoothHostPairingController::OnConfigureHostMessage( 385 void BluetoothHostPairingController::OnConfigureHostMessage(
385 const pairing_api::ConfigureHost& message) { 386 const pairing_api::ConfigureHost& message) {
386 ChangeStage(STAGE_SETUP_BASIC_CONFIGURATION); 387 ChangeStage(STAGE_SETUP_BASIC_CONFIGURATION);
387 FOR_EACH_OBSERVER(Observer, observers_, 388 for (Observer& observer : observers_) {
388 ConfigureHostRequested( 389 observer.ConfigureHostRequested(
389 message.parameters().accepted_eula(), 390 message.parameters().accepted_eula(), message.parameters().lang(),
390 message.parameters().lang(), 391 message.parameters().timezone(), message.parameters().send_reports(),
391 message.parameters().timezone(), 392 message.parameters().keyboard_layout());
392 message.parameters().send_reports(), 393 }
393 message.parameters().keyboard_layout()));
394 } 394 }
395 395
396 void BluetoothHostPairingController::OnPairDevicesMessage( 396 void BluetoothHostPairingController::OnPairDevicesMessage(
397 const pairing_api::PairDevices& message) { 397 const pairing_api::PairDevices& message) {
398 DCHECK(thread_checker_.CalledOnValidThread()); 398 DCHECK(thread_checker_.CalledOnValidThread());
399 enrollment_domain_ = message.parameters().enrolling_domain(); 399 enrollment_domain_ = message.parameters().enrolling_domain();
400 ChangeStage(STAGE_ENROLLING); 400 ChangeStage(STAGE_ENROLLING);
401 FOR_EACH_OBSERVER(Observer, observers_, 401 for (Observer& observer : observers_)
402 EnrollHostRequested( 402 observer.EnrollHostRequested(message.parameters().admin_access_token());
403 message.parameters().admin_access_token()));
404 } 403 }
405 404
406 void BluetoothHostPairingController::OnCompleteSetupMessage( 405 void BluetoothHostPairingController::OnCompleteSetupMessage(
407 const pairing_api::CompleteSetup& message) { 406 const pairing_api::CompleteSetup& message) {
408 DCHECK(thread_checker_.CalledOnValidThread()); 407 DCHECK(thread_checker_.CalledOnValidThread());
409 if (current_stage_ != STAGE_ENROLLMENT_SUCCESS) { 408 if (current_stage_ != STAGE_ENROLLMENT_SUCCESS) {
410 ChangeStage(STAGE_ENROLLMENT_ERROR); 409 ChangeStage(STAGE_ENROLLMENT_ERROR);
411 } else { 410 } else {
412 // TODO(zork): Handle adding another controller. (http://crbug.com/405757) 411 // TODO(zork): Handle adding another controller. (http://crbug.com/405757)
413 ChangeStage(STAGE_FINISHED); 412 ChangeStage(STAGE_FINISHED);
414 } 413 }
415 Reset(); 414 Reset();
416 } 415 }
417 416
418 void BluetoothHostPairingController::OnErrorMessage( 417 void BluetoothHostPairingController::OnErrorMessage(
419 const pairing_api::Error& message) { 418 const pairing_api::Error& message) {
420 NOTREACHED(); 419 NOTREACHED();
421 } 420 }
422 421
423 void BluetoothHostPairingController::OnAddNetworkMessage( 422 void BluetoothHostPairingController::OnAddNetworkMessage(
424 const pairing_api::AddNetwork& message) { 423 const pairing_api::AddNetwork& message) {
425 DCHECK(thread_checker_.CalledOnValidThread()); 424 DCHECK(thread_checker_.CalledOnValidThread());
426 FOR_EACH_OBSERVER(Observer, observers_, 425 for (Observer& observer : observers_)
427 AddNetworkRequested(message.parameters().onc_spec())); 426 observer.AddNetworkRequested(message.parameters().onc_spec());
428 } 427 }
429 428
430 void BluetoothHostPairingController::AdapterPresentChanged( 429 void BluetoothHostPairingController::AdapterPresentChanged(
431 device::BluetoothAdapter* adapter, 430 device::BluetoothAdapter* adapter,
432 bool present) { 431 bool present) {
433 DCHECK_EQ(adapter, adapter_.get()); 432 DCHECK_EQ(adapter, adapter_.get());
434 if (present) { 433 if (present) {
435 adapter_->RemoveObserver(this); 434 adapter_->RemoveObserver(this);
436 SetName(); 435 SetName();
437 } 436 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION); 556 ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
558 } 557 }
559 558
560 void BluetoothHostPairingController::AuthorizePairing( 559 void BluetoothHostPairingController::AuthorizePairing(
561 device::BluetoothDevice* device) { 560 device::BluetoothDevice* device) {
562 // Disallow unknown device. 561 // Disallow unknown device.
563 device->RejectPairing(); 562 device->RejectPairing();
564 } 563 }
565 564
566 } // namespace pairing_chromeos 565 } // namespace pairing_chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698