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

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

Issue 2519633002: ChromeOS: disable MD OOBE by default. (Closed)
Patch Set: Created 4 years, 1 month 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 327 }
328 // We need to reset the kOobeControllerDetected pref to allow the user to have 328 // We need to reset the kOobeControllerDetected pref to allow the user to have
329 // the choice to setup the device manually. The pref will be set properly if 329 // the choice to setup the device manually. The pref will be set properly if
330 // an eligible controller is detected later. 330 // an eligible controller is detected later.
331 SetControllerDetectedPref(false); 331 SetControllerDetectedPref(false);
332 332
333 // Show Material Design unless explicitly disabled or for an untested UX, 333 // Show Material Design unless explicitly disabled or for an untested UX,
334 // or when resuming an OOBE that had it disabled or unset. We use an if/else 334 // or when resuming an OOBE that had it disabled or unset. We use an if/else
335 // here to try and not set state when it is the default value so it can 335 // here to try and not set state when it is the default value so it can
336 // change and affect the OOBE again. 336 // change and affect the OOBE again.
337 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 337 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
338 chromeos::switches::kDisableMdOobe)) 338 chromeos::switches::kEnableMdOobe))
339 SetShowMdOobe(false); 339 SetShowMdOobe(false);
340 else if ((screen_pref.empty() || 340 else if ((screen_pref.empty() ||
341 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) || 341 GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) ||
342 GetLocalState()->GetBoolean(prefs::kOobeMdMode)) 342 GetLocalState()->GetBoolean(prefs::kOobeMdMode))
343 SetShowMdOobe(true); 343 SetShowMdOobe(true);
344 344
345 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). 345 // TODO(drcrash): Remove this after testing (http://crbug.com/647411).
346 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) { 346 if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) {
347 SetShowMdOobe(false); 347 SetShowMdOobe(false);
348 } 348 }
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1500 } 1500 }
1501 1501
1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1503 screen->SetParameters(effective_config, shark_controller_.get()); 1503 screen->SetParameters(effective_config, shark_controller_.get());
1504 SetStatusAreaVisible(true); 1504 SetStatusAreaVisible(true);
1505 SetCurrentScreen(screen); 1505 SetCurrentScreen(screen);
1506 } 1506 }
1507 1507
1508 } // namespace chromeos 1508 } // 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