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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_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 (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_ENROLLMENT_ENROLLMENT_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // shark device for remote enrollment. 49 // shark device for remote enrollment.
50 void SetParameters( 50 void SetParameters(
51 EnrollmentScreenActor::EnrollmentMode enrollment_mode, 51 EnrollmentScreenActor::EnrollmentMode enrollment_mode,
52 const std::string& management_domain, 52 const std::string& management_domain,
53 const std::string& enrollment_user, 53 const std::string& enrollment_user,
54 const std::string& auth_token, 54 const std::string& auth_token,
55 pairing_chromeos::ControllerPairingController* shark_controller, 55 pairing_chromeos::ControllerPairingController* shark_controller,
56 pairing_chromeos::HostPairingController* remora_controller); 56 pairing_chromeos::HostPairingController* remora_controller);
57 57
58 // WizardScreen implementation: 58 // WizardScreen implementation:
59 virtual void PrepareToShow() OVERRIDE; 59 virtual void PrepareToShow() override;
60 virtual void Show() OVERRIDE; 60 virtual void Show() override;
61 virtual void Hide() OVERRIDE; 61 virtual void Hide() override;
62 virtual std::string GetName() const OVERRIDE; 62 virtual std::string GetName() const override;
63 63
64 // pairing_chromeos::HostPairingController::Observer: 64 // pairing_chromeos::HostPairingController::Observer:
65 virtual void PairingStageChanged(Stage new_stage) OVERRIDE; 65 virtual void PairingStageChanged(Stage new_stage) override;
66 virtual void ConfigureHost(bool accepted_eula, 66 virtual void ConfigureHost(bool accepted_eula,
67 const std::string& lang, 67 const std::string& lang,
68 const std::string& timezone, 68 const std::string& timezone,
69 bool send_reports, 69 bool send_reports,
70 const std::string& keyboard_layout) OVERRIDE; 70 const std::string& keyboard_layout) override;
71 virtual void EnrollHost(const std::string& auth_token) OVERRIDE; 71 virtual void EnrollHost(const std::string& auth_token) override;
72 72
73 // EnrollmentScreenActor::Controller implementation: 73 // EnrollmentScreenActor::Controller implementation:
74 virtual void OnLoginDone(const std::string& user) OVERRIDE; 74 virtual void OnLoginDone(const std::string& user) override;
75 virtual void OnAuthError(const GoogleServiceAuthError& error) OVERRIDE; 75 virtual void OnAuthError(const GoogleServiceAuthError& error) override;
76 virtual void OnOAuthTokenAvailable(const std::string& oauth_token) OVERRIDE; 76 virtual void OnOAuthTokenAvailable(const std::string& oauth_token) override;
77 virtual void OnRetry() OVERRIDE; 77 virtual void OnRetry() override;
78 virtual void OnCancel() OVERRIDE; 78 virtual void OnCancel() override;
79 virtual void OnConfirmationClosed() OVERRIDE; 79 virtual void OnConfirmationClosed() override;
80 80
81 // Used for testing. 81 // Used for testing.
82 EnrollmentScreenActor* GetActor() { 82 EnrollmentScreenActor* GetActor() {
83 return actor_; 83 return actor_;
84 } 84 }
85 85
86 private: 86 private:
87 FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess); 87 FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess);
88 88
89 // Starts the Lockbox storage process. 89 // Starts the Lockbox storage process.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 std::string auth_token_; 131 std::string auth_token_;
132 int lockbox_init_duration_; 132 int lockbox_init_duration_;
133 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_; 133 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
134 134
135 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen); 135 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
136 }; 136 };
137 137
138 } // namespace chromeos 138 } // namespace chromeos
139 139
140 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 140 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698