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

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

Issue 277083004: Added browser and OS credits link to EULA page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 skip_update_enroll_after_eula_ = true; 499 skip_update_enroll_after_eula_ = true;
500 } 500 }
501 501
502 /////////////////////////////////////////////////////////////////////////////// 502 ///////////////////////////////////////////////////////////////////////////////
503 // WizardController, ExitHandlers: 503 // WizardController, ExitHandlers:
504 void WizardController::OnHIDDetectionCompleted() { 504 void WizardController::OnHIDDetectionCompleted() {
505 ShowNetworkScreen(); 505 ShowNetworkScreen();
506 } 506 }
507 507
508 void WizardController::OnNetworkConnected() { 508 void WizardController::OnNetworkConnected() {
509 if (is_official_build_) { 509 // if (is_official_build_) {
510 if (true) {
xiyuan 2014/05/13 20:45:53 Debugging code still not removed.
zel 2014/05/13 21:02:23 Done.
510 if (!StartupUtils::IsEulaAccepted()) { 511 if (!StartupUtils::IsEulaAccepted()) {
511 ShowEulaScreen(); 512 ShowEulaScreen();
512 } else { 513 } else {
513 // Possible cases: 514 // Possible cases:
514 // 1. EULA was accepted, forced shutdown/reboot during update. 515 // 1. EULA was accepted, forced shutdown/reboot during update.
515 // 2. EULA was accepted, planned reboot after update. 516 // 2. EULA was accepted, planned reboot after update.
516 // Make sure that device is up-to-date. 517 // Make sure that device is up-to-date.
517 InitiateOOBEUpdate(); 518 InitiateOOBEUpdate();
518 } 519 }
519 } else { 520 } else {
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 // cancelled on destruction. 1061 // cancelled on destruction.
1061 GetTimezoneProvider()->RequestTimezone( 1062 GetTimezoneProvider()->RequestTimezone(
1062 position, 1063 position,
1063 false, // sensor 1064 false, // sensor
1064 timeout - elapsed, 1065 timeout - elapsed,
1065 base::Bind(&WizardController::OnTimezoneResolved, 1066 base::Bind(&WizardController::OnTimezoneResolved,
1066 base::Unretained(this))); 1067 base::Unretained(this)));
1067 } 1068 }
1068 1069
1069 } // namespace chromeos 1070 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698