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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1957953003: [Merge to M50] [Chrome OS Bootstrapping]: Do not always power off the Bluetooth adapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 7 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 | components/pairing/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 0102cee2c459c30286c2d2c382eb957441626b9e..2fd196fd42560f8852f2830fade59e826d793070 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -378,7 +378,9 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
} else if (screen_name == kHostPairingScreenName) {
if (!remora_controller_) {
remora_controller_.reset(
- new pairing_chromeos::BluetoothHostPairingController());
+ new pairing_chromeos::BluetoothHostPairingController(
+ BrowserThread::GetMessageLoopProxyForThread(
+ BrowserThread::FILE)));
remora_controller_->StartPairing();
}
return new HostPairingScreen(this,
@@ -1334,6 +1336,7 @@ void WizardController::MaybeStartListeningForSharkConnection() {
if (!shark_connection_listener_) {
shark_connection_listener_.reset(
new pairing_chromeos::SharkConnectionListener(
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
base::Bind(&WizardController::OnSharkConnected,
weak_factory_.GetWeakPtr())));
}
« no previous file with comments | « no previous file | components/pairing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698