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

Unified Diff: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

Issue 517023002: Switch to Bluetooth pairing API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/host_pairing_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
index 4d10a0722b33480a066487fd570abd1648e1e423..4563a16fdc0cccb92312a7bb88f2f47f8fac2b40 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
@@ -7,8 +7,7 @@
#include "base/command_line.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chromeos/chromeos_switches.h"
-#include "components/pairing/fake_controller_pairing_controller.h"
+#include "components/pairing/bluetooth_controller_pairing_controller.h"
#include "google_apis/gaia/gaia_auth_util.h"
using namespace chromeos::controller_pairing;
@@ -28,10 +27,7 @@ ControllerPairingScreen::ControllerPairingScreen(
current_stage_(ControllerPairingController::STAGE_NONE),
device_preselected_(false) {
actor_->SetDelegate(this);
- std::string controller_config =
- base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kShowControllerPairingDemo);
- controller_.reset(new FakeControllerPairingController(controller_config));
+ controller_.reset(new BluetoothControllerPairingController());
controller_->AddObserver(this);
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/host_pairing_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698