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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/wizard_controller.h

Issue 313923005: Revert 273875 "Remove the option to skip auto-update checks on OOBE." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/wizard_controller.cc » ('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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // Advances to login screen. Should be used in for testing only. 105 // Advances to login screen. Should be used in for testing only.
106 void SkipToLoginForTesting(const LoginScreenContext& context); 106 void SkipToLoginForTesting(const LoginScreenContext& context);
107 107
108 // Adds and removes an observer. 108 // Adds and removes an observer.
109 void AddObserver(Observer* observer); 109 void AddObserver(Observer* observer);
110 void RemoveObserver(Observer* observer); 110 void RemoveObserver(Observer* observer);
111 111
112 // Called right after the browser session has started. 112 // Called right after the browser session has started.
113 void OnSessionStart(); 113 void OnSessionStart();
114 114
115 // Skip update, go straight to enrollment after EULA is accepted.
116 void SkipUpdateEnrollAfterEula();
117
115 // TODO(antrim) : temporary hack. Should be removed once screen system is 118 // TODO(antrim) : temporary hack. Should be removed once screen system is
116 // reworked at hackaton. 119 // reworked at hackaton.
117 void EnableUserImageScreenReturnToPreviousHack(); 120 void EnableUserImageScreenReturnToPreviousHack();
118 121
119 // Lazy initializers and getters for screens. 122 // Lazy initializers and getters for screens.
120 NetworkScreen* GetNetworkScreen(); 123 NetworkScreen* GetNetworkScreen();
121 UpdateScreen* GetUpdateScreen(); 124 UpdateScreen* GetUpdateScreen();
122 UserImageScreen* GetUserImageScreen(); 125 UserImageScreen* GetUserImageScreen();
123 EulaScreen* GetEulaScreen(); 126 EulaScreen* GetEulaScreen();
124 EnrollmentScreen* GetEnrollmentScreen(); 127 EnrollmentScreen* GetEnrollmentScreen();
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 scoped_ptr<base::DictionaryValue> screen_parameters_; 342 scoped_ptr<base::DictionaryValue> screen_parameters_;
340 343
341 base::OneShotTimer<WizardController> smooth_show_timer_; 344 base::OneShotTimer<WizardController> smooth_show_timer_;
342 345
343 OobeDisplay* oobe_display_; 346 OobeDisplay* oobe_display_;
344 347
345 // State of Usage stat/error reporting checkbox on EULA screen 348 // State of Usage stat/error reporting checkbox on EULA screen
346 // during wizard lifetime. 349 // during wizard lifetime.
347 bool usage_statistics_reporting_; 350 bool usage_statistics_reporting_;
348 351
352 // If true then update check is cancelled and enrollment is started after
353 // EULA is accepted.
354 bool skip_update_enroll_after_eula_;
355
349 // Time when the EULA was accepted. Used to measure the duration from the EULA 356 // Time when the EULA was accepted. Used to measure the duration from the EULA
350 // acceptance until the Sign-In screen is displayed. 357 // acceptance until the Sign-In screen is displayed.
351 base::Time time_eula_accepted_; 358 base::Time time_eula_accepted_;
352 359
353 ObserverList<Observer> observer_list_; 360 ObserverList<Observer> observer_list_;
354 361
355 bool login_screen_started_; 362 bool login_screen_started_;
356 363
357 // Indicates that once image selection screen finishes we should return to 364 // Indicates that once image selection screen finishes we should return to
358 // a previous screen instead of proceeding with usual flow. 365 // a previous screen instead of proceeding with usual flow.
(...skipping 19 matching lines...) Expand all
378 base::Closure on_timezone_resolved_for_testing_; 385 base::Closure on_timezone_resolved_for_testing_;
379 386
380 base::WeakPtrFactory<WizardController> weak_factory_; 387 base::WeakPtrFactory<WizardController> weak_factory_;
381 388
382 DISALLOW_COPY_AND_ASSIGN(WizardController); 389 DISALLOW_COPY_AND_ASSIGN(WizardController);
383 }; 390 };
384 391
385 } // namespace chromeos 392 } // namespace chromeos
386 393
387 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 394 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698