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

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

Issue 2383953002: [Bootstrapping] Introduce an accelerator to put a ChromeOS device into Slave OOBE process. (Closed)
Patch Set: Address achuith@'s comments. 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 side-by-side diff with in-line comments
Download patch
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 33b223df551dc0ca3b2d0d1827153987c2deba47..b69c59a70794463d916ae8231bc24db04089ccd7 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -166,6 +166,12 @@ void SetControllerDetectedPref(bool value) {
prefs->CommitPendingWrite();
}
+// Checks if the device is a "slave" device in the bootstrapping process.
+bool IsBootstrappingSlave() {
+ return g_browser_process->local_state()->GetBoolean(
+ prefs::kIsBootstrappingSlave);
+}
+
// Checks if the device is a "Master" device in the bootstrapping process.
bool IsBootstrappingMaster() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -430,7 +436,16 @@ void WizardController::ShowNetworkScreen() {
SetStatusAreaVisible(HasScreen(kNetworkScreenName));
SetCurrentScreen(GetScreen(kNetworkScreenName));
- MaybeStartListeningForSharkConnection();
+ // There are two possible screens where we listen to the incoming Bluetooth
+ // connection request: the first one is the HID detection screen, which will
+ // show up when there is no sufficient input devices. In this case, we just
+ // keep the logic as it is today: always put the Bluetooth is discoverable
+ // mode. The other place is the Network screen (here), which will show up when
+ // there are input devices detected. In this case, we disable the Bluetooth by
+ // default until the user explicitly enable it by pressing a key combo (Ctrl+
+ // Alt+Shift+S).
+ if (IsBootstrappingSlave())
+ MaybeStartListeningForSharkConnection();
}
void WizardController::ShowLoginScreen(const LoginScreenContext& context) {
@@ -559,6 +574,9 @@ void WizardController::ShowHIDDetectionScreen() {
SetShowMdOobe(false); // Disable the MD OOBE from there on.
SetStatusAreaVisible(true);
SetCurrentScreen(GetScreen(kHIDDetectionScreenName));
+ // In HID detection screen, puts the Bluetooth in discoverable mode and waits
+ // for the incoming Bluetooth connection request. See the comments in
+ // WizardController::ShowNetworkScreen() for more details.
MaybeStartListeningForSharkConnection();
}
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698