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

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

Issue 1829453002: Enable bootstrapping feature by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CL format Created 4 years, 9 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/startup_utils.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 209ab118c817608e668212e33de56873874eb43b..49fe73d3c7fa53e2b96eed62a1dcae1e768042e7 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -310,12 +310,11 @@ class WizardController : public BaseScreenDelegate,
// Returns false if timezone has already been resolved.
bool SetOnTimeZoneResolvedForTesting(const base::Closure& callback);
- // Returns true for pairing remora OOBE.
+ // Returns true if kHostPairingOobe perf has been set. If it's set, launch the
+ // pairing remora OOBE from the beginning no matter an eligible controller is
+ // detected or not.
bool IsRemoraPairingOobe() const;
- // Returns true for pairing slave OOBE.
- bool IsSlavePairingOobe() const;
-
// Starts listening for an incoming shark controller connection, if we are
// running remora OOBE.
void MaybeStartListeningForSharkConnection();
@@ -429,9 +428,6 @@ class WizardController : public BaseScreenDelegate,
bool timezone_resolved_ = false;
base::Closure on_timezone_resolved_for_testing_;
- // True if shark device initiated connection to this device.
- bool shark_controller_detected_ = false;
-
// Listens for incoming connection from a shark controller if a regular (not
// pairing) remora OOBE is active. If connection is established, wizard
// conroller swithces to a pairing OOBE.
« no previous file with comments | « chrome/browser/chromeos/login/startup_utils.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698