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

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

Issue 2299893002: ChromeOS: Enable Material Design OOBE by default. (Closed)
Patch Set: Update after review. Created 4 years, 3 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 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 #if defined(GOOGLE_CHROME_BUILD) 179 #if defined(GOOGLE_CHROME_BUILD)
180 void InitializeCrashReporter() { 180 void InitializeCrashReporter() {
181 // The crash reporter initialization needs IO to complete. 181 // The crash reporter initialization needs IO to complete.
182 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); 182 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
183 breakpad::InitCrashReporter(std::string()); 183 breakpad::InitCrashReporter(std::string());
184 } 184 }
185 #endif 185 #endif
186 186
187 bool UseMDOobe() { 187 bool UseMDOobe() {
188 return base::CommandLine::ForCurrentProcess()->HasSwitch( 188 return !base::CommandLine::ForCurrentProcess()->HasSwitch(
189 chromeos::switches::kEnableMdOobe); 189 chromeos::switches::kDisableMdOobe);
190 } 190 }
191 191
192 } // namespace 192 } // namespace
193 193
194 namespace chromeos { 194 namespace chromeos {
195 195
196 const char WizardController::kNetworkScreenName[] = "network"; 196 const char WizardController::kNetworkScreenName[] = "network";
197 const char WizardController::kLoginScreenName[] = "login"; 197 const char WizardController::kLoginScreenName[] = "login";
198 const char WizardController::kUpdateScreenName[] = "update"; 198 const char WizardController::kUpdateScreenName[] = "update";
199 const char WizardController::kUserImageScreenName[] = "image"; 199 const char WizardController::kUserImageScreenName[] = "image";
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1417 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1418 } 1418 }
1419 1419
1420 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1420 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1421 screen->SetParameters(effective_config, shark_controller_.get()); 1421 screen->SetParameters(effective_config, shark_controller_.get());
1422 SetStatusAreaVisible(true); 1422 SetStatusAreaVisible(true);
1423 SetCurrentScreen(screen); 1423 SetCurrentScreen(screen);
1424 } 1424 }
1425 1425
1426 } // namespace chromeos 1426 } // 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