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

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

Issue 2600983003: ChromeOS MD-OOBE: Add HID detection screen. (Closed)
Patch Set: Rebased. Created 3 years, 11 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/resources/chromeos/login/custom_elements_oobe.html » ('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 f77b6ebd83383dc2347183d162fbbddc504314de..55a45f9b271a8b2c2e9b229304e9aea38c182be3 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -603,8 +603,6 @@ void WizardController::ShowSupervisedUserCreationScreen() {
void WizardController::ShowHIDDetectionScreen() {
VLOG(1) << "Showing HID discovery screen.";
- // TODO(drcrash): Remove this after testing (http://crbug.com/647411).
- SetShowMdOobe(false); // Disable the MD OOBE from there on.
SetStatusAreaVisible(true);
SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION));
// In HID detection screen, puts the Bluetooth in discoverable mode and waits
@@ -985,6 +983,8 @@ void WizardController::SetCurrentScreenSmooth(BaseScreen* new_current,
previous_screen_ = current_screen_;
current_screen_ = new_current;
+ oobe_ui_->UpdateLocalizedStringsIfNeeded();
+
if (use_smoothing) {
smooth_show_timer_.Start(
FROM_HERE,
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/custom_elements_oobe.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698