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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2530453002: ChromeOS: enable MD OOBE by default. (Closed)
Patch Set: Rebased. Created 4 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 328 }
329 // We need to reset the kOobeControllerDetected pref to allow the user to have 329 // We need to reset the kOobeControllerDetected pref to allow the user to have
330 // the choice to setup the device manually. The pref will be set properly if 330 // the choice to setup the device manually. The pref will be set properly if
331 // an eligible controller is detected later. 331 // an eligible controller is detected later.
332 SetControllerDetectedPref(false); 332 SetControllerDetectedPref(false);
333 333
334 // Show Material Design unless explicitly disabled or for an untested UX, 334 // Show Material Design unless explicitly disabled or for an untested UX,
335 // or when resuming an OOBE that had it disabled or unset. We use an if/else 335 // or when resuming an OOBE that had it disabled or unset. We use an if/else
336 // here to try and not set state when it is the default value so it can 336 // here to try and not set state when it is the default value so it can
337 // change and affect the OOBE again. 337 // change and affect the OOBE again.
338 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 338 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
339 chromeos::switches::kEnableMdOobe)) 339 chromeos::switches::kDisableMdOobe))
340 SetShowMdOobe(false); 340 SetShowMdOobe(false);
341 else if ((screen_pref.empty() || 341 else if ((screen_pref.empty() ||
342 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) || 342 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) ||
343 GetLocalState()->GetBoolean(prefs::kOobeMdMode)) 343 GetLocalState()->GetBoolean(prefs::kOobeMdMode))
344 SetShowMdOobe(true); 344 SetShowMdOobe(true);
345 345
346 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). 346 // TODO(drcrash): Remove this after testing (http://crbug.com/647411).
347 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { 347 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) {
348 SetShowMdOobe(false); 348 SetShowMdOobe(false);
349 } 349 }
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1500 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1501 } 1501 }
1502 1502
1503 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1503 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1504 screen->SetParameters(effective_config, shark_controller_.get()); 1504 screen->SetParameters(effective_config, shark_controller_.get());
1505 SetStatusAreaVisible(true); 1505 SetStatusAreaVisible(true);
1506 SetCurrentScreen(screen); 1506 SetCurrentScreen(screen);
1507 } 1507 }
1508 1508
1509 } // namespace chromeos 1509 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698