Commit 9ec71986 authored by zork's avatar zork Committed by Commit bot

Switch to Bluetooth pairing API

BUG=381007

Review URL: https://codereview.chromium.org/517023002

Cr-Commit-Position: refs/heads/master@{#292499}
parent 115bf013
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chromeos/chromeos_switches.h" #include "components/pairing/bluetooth_controller_pairing_controller.h"
#include "components/pairing/fake_controller_pairing_controller.h"
#include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_auth_util.h"
using namespace chromeos::controller_pairing; using namespace chromeos::controller_pairing;
...@@ -28,10 +27,7 @@ ControllerPairingScreen::ControllerPairingScreen( ...@@ -28,10 +27,7 @@ ControllerPairingScreen::ControllerPairingScreen(
current_stage_(ControllerPairingController::STAGE_NONE), current_stage_(ControllerPairingController::STAGE_NONE),
device_preselected_(false) { device_preselected_(false) {
actor_->SetDelegate(this); actor_->SetDelegate(this);
std::string controller_config = controller_.reset(new BluetoothControllerPairingController());
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kShowControllerPairingDemo);
controller_.reset(new FakeControllerPairingController(controller_config));
controller_->AddObserver(this); controller_->AddObserver(this);
} }
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chromeos/chromeos_switches.h" #include "components/pairing/bluetooth_host_pairing_controller.h"
#include "components/pairing/fake_host_pairing_controller.h"
namespace chromeos { namespace chromeos {
...@@ -20,10 +19,7 @@ HostPairingScreen::HostPairingScreen(ScreenObserver* observer, ...@@ -20,10 +19,7 @@ HostPairingScreen::HostPairingScreen(ScreenObserver* observer,
actor_(actor), actor_(actor),
current_stage_(HostPairingController::STAGE_NONE) { current_stage_(HostPairingController::STAGE_NONE) {
actor_->SetDelegate(this); actor_->SetDelegate(this);
std::string controller_config = controller_.reset(new BluetoothHostPairingController());
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kShowHostPairingDemo);
controller_.reset(new FakeHostPairingController(controller_config));
controller_->AddObserver(this); controller_->AddObserver(this);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment