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

Unified Diff: chrome/browser/chromeos/login/screens/host_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 | « chrome/browser/chromeos/login/screens/controller_pairing_screen.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/host_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index b57692551e38a99cdfddd4a75b0c63e74d427618..c4a0671c7763036aa03325f70925b427a21e762d 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -6,8 +6,7 @@
#include "base/command_line.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chromeos/chromeos_switches.h"
-#include "components/pairing/fake_host_pairing_controller.h"
+#include "components/pairing/bluetooth_host_pairing_controller.h"
namespace chromeos {
@@ -20,10 +19,7 @@ HostPairingScreen::HostPairingScreen(ScreenObserver* observer,
actor_(actor),
current_stage_(HostPairingController::STAGE_NONE) {
actor_->SetDelegate(this);
- std::string controller_config =
- base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kShowHostPairingDemo);
- controller_.reset(new FakeHostPairingController(controller_config));
+ controller_.reset(new BluetoothHostPairingController());
controller_->AddObserver(this);
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/controller_pairing_screen.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698