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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 27 matching lines...) Expand all
38 // Hands over OOBE control to this AutoEnrollmentCheckStep. It'll return the 38 // Hands over OOBE control to this AutoEnrollmentCheckStep. It'll return the
39 // flow back to the caller via the |screen_observer_|'s OnExit function. 39 // flow back to the caller via the |screen_observer_|'s OnExit function.
40 void Start(); 40 void Start();
41 41
42 void set_auto_enrollment_controller( 42 void set_auto_enrollment_controller(
43 AutoEnrollmentController* auto_enrollment_controller) { 43 AutoEnrollmentController* auto_enrollment_controller) {
44 auto_enrollment_controller_ = auto_enrollment_controller; 44 auto_enrollment_controller_ = auto_enrollment_controller;
45 } 45 }
46 46
47 // WizardScreen implementation: 47 // WizardScreen implementation:
48 virtual void PrepareToShow() OVERRIDE; 48 virtual void PrepareToShow() override;
49 virtual void Show() OVERRIDE; 49 virtual void Show() override;
50 virtual void Hide() OVERRIDE; 50 virtual void Hide() override;
51 virtual std::string GetName() const OVERRIDE; 51 virtual std::string GetName() const override;
52 52
53 // AutoEnrollmentCheckScreenActor::Delegate implementation: 53 // AutoEnrollmentCheckScreenActor::Delegate implementation:
54 virtual void OnExit() OVERRIDE; 54 virtual void OnExit() override;
55 virtual void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) OVERRIDE; 55 virtual void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) override;
56 56
57 // NetworkPortalDetector::Observer implementation: 57 // NetworkPortalDetector::Observer implementation:
58 virtual void OnPortalDetectionCompleted( 58 virtual void OnPortalDetectionCompleted(
59 const NetworkState* network, 59 const NetworkState* network,
60 const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; 60 const NetworkPortalDetector::CaptivePortalState& state) override;
61 61
62 private: 62 private:
63 // Handles update notifications regarding the auto-enrollment check. 63 // Handles update notifications regarding the auto-enrollment check.
64 void OnAutoEnrollmentCheckProgressed(policy::AutoEnrollmentState state); 64 void OnAutoEnrollmentCheckProgressed(policy::AutoEnrollmentState state);
65 65
66 // Handles a state update, updating the UI and saving the state. 66 // Handles a state update, updating the UI and saving the state.
67 void UpdateState( 67 void UpdateState(
68 NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status, 68 NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status,
69 policy::AutoEnrollmentState new_auto_enrollment_state); 69 policy::AutoEnrollmentState new_auto_enrollment_state);
70 70
(...skipping 26 matching lines...) Expand all
97 97
98 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_; 98 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_;
99 policy::AutoEnrollmentState auto_enrollment_state_; 99 policy::AutoEnrollmentState auto_enrollment_state_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen); 101 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen);
102 }; 102 };
103 103
104 } // namespace chromeos 104 } // namespace chromeos
105 105
106 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_ 106 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698