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

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

Issue 306993004: Remove the option to skip auto-update checks on OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | 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
118 // TODO(antrim) : temporary hack. Should be removed once screen system is 115 // TODO(antrim) : temporary hack. Should be removed once screen system is
119 // reworked at hackaton. 116 // reworked at hackaton.
120 void EnableUserImageScreenReturnToPreviousHack(); 117 void EnableUserImageScreenReturnToPreviousHack();
121 118
122 // Lazy initializers and getters for screens. 119 // Lazy initializers and getters for screens.
123 NetworkScreen* GetNetworkScreen(); 120 NetworkScreen* GetNetworkScreen();
124 UpdateScreen* GetUpdateScreen(); 121 UpdateScreen* GetUpdateScreen();
125 UserImageScreen* GetUserImageScreen(); 122 UserImageScreen* GetUserImageScreen();
126 EulaScreen* GetEulaScreen(); 123 EulaScreen* GetEulaScreen();
127 EnrollmentScreen* GetEnrollmentScreen(); 124 EnrollmentScreen* GetEnrollmentScreen();
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 scoped_ptr<base::DictionaryValue> screen_parameters_; 342 scoped_ptr<base::DictionaryValue> screen_parameters_;
346 343
347 base::OneShotTimer<WizardController> smooth_show_timer_; 344 base::OneShotTimer<WizardController> smooth_show_timer_;
348 345
349 OobeDisplay* oobe_display_; 346 OobeDisplay* oobe_display_;
350 347
351 // State of Usage stat/error reporting checkbox on EULA screen 348 // State of Usage stat/error reporting checkbox on EULA screen
352 // during wizard lifetime. 349 // during wizard lifetime.
353 bool usage_statistics_reporting_; 350 bool usage_statistics_reporting_;
354 351
355 // If true then update check is cancelled and enrollment is started after
356 // EULA is accepted.
357 bool skip_update_enroll_after_eula_;
358
359 // Time when the EULA was accepted. Used to measure the duration from the EULA 352 // Time when the EULA was accepted. Used to measure the duration from the EULA
360 // acceptance until the Sign-In screen is displayed. 353 // acceptance until the Sign-In screen is displayed.
361 base::Time time_eula_accepted_; 354 base::Time time_eula_accepted_;
362 355
363 ObserverList<Observer> observer_list_; 356 ObserverList<Observer> observer_list_;
364 357
365 bool login_screen_started_; 358 bool login_screen_started_;
366 359
367 // Indicates that once image selection screen finishes we should return to 360 // Indicates that once image selection screen finishes we should return to
368 // a previous screen instead of proceeding with usual flow. 361 // a previous screen instead of proceeding with usual flow.
(...skipping 19 matching lines...) Expand all
388 base::Closure on_timezone_resolved_for_testing_; 381 base::Closure on_timezone_resolved_for_testing_;
389 382
390 base::WeakPtrFactory<WizardController> weak_factory_; 383 base::WeakPtrFactory<WizardController> weak_factory_;
391 384
392 DISALLOW_COPY_AND_ASSIGN(WizardController); 385 DISALLOW_COPY_AND_ASSIGN(WizardController);
393 }; 386 };
394 387
395 } // namespace chromeos 388 } // namespace chromeos
396 389
397 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 390 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698