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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_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_SCREENS_UPDATE_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 21 matching lines...) Expand all
32 public UpdateScreenActor::Delegate, 32 public UpdateScreenActor::Delegate,
33 public WizardScreen, 33 public WizardScreen,
34 public NetworkPortalDetector::Observer { 34 public NetworkPortalDetector::Observer {
35 public: 35 public:
36 UpdateScreen(ScreenObserver* screen_observer, UpdateScreenActor* actor); 36 UpdateScreen(ScreenObserver* screen_observer, UpdateScreenActor* actor);
37 virtual ~UpdateScreen(); 37 virtual ~UpdateScreen();
38 38
39 static UpdateScreen* Get(ScreenManager* manager); 39 static UpdateScreen* Get(ScreenManager* manager);
40 40
41 // Overridden from WizardScreen. 41 // Overridden from WizardScreen.
42 virtual void PrepareToShow() OVERRIDE; 42 virtual void PrepareToShow() override;
43 virtual void Show() OVERRIDE; 43 virtual void Show() override;
44 virtual void Hide() OVERRIDE; 44 virtual void Hide() override;
45 virtual std::string GetName() const OVERRIDE; 45 virtual std::string GetName() const override;
46 46
47 // UpdateScreenActor::Delegate implementation: 47 // UpdateScreenActor::Delegate implementation:
48 virtual void CancelUpdate() OVERRIDE; 48 virtual void CancelUpdate() override;
49 virtual void OnActorDestroyed(UpdateScreenActor* actor) OVERRIDE; 49 virtual void OnActorDestroyed(UpdateScreenActor* actor) override;
50 virtual void OnConnectToNetworkRequested() OVERRIDE; 50 virtual void OnConnectToNetworkRequested() override;
51 51
52 // Starts network check. Made virtual to simplify mocking. 52 // Starts network check. Made virtual to simplify mocking.
53 virtual void StartNetworkCheck(); 53 virtual void StartNetworkCheck();
54 54
55 // Reboot check delay get/set, in seconds. 55 // Reboot check delay get/set, in seconds.
56 int reboot_check_delay() const { return reboot_check_delay_; } 56 int reboot_check_delay() const { return reboot_check_delay_; }
57 void SetRebootCheckDelay(int seconds); 57 void SetRebootCheckDelay(int seconds);
58 58
59 // Returns true if this instance is still active (i.e. has not been deleted). 59 // Returns true if this instance is still active (i.e. has not been deleted).
60 static bool HasInstance(UpdateScreen* inst); 60 static bool HasInstance(UpdateScreen* inst);
61 61
62 void SetIgnoreIdleStatus(bool ignore_idle_status); 62 void SetIgnoreIdleStatus(bool ignore_idle_status);
63 63
64 enum ExitReason { 64 enum ExitReason {
65 REASON_UPDATE_CANCELED = 0, 65 REASON_UPDATE_CANCELED = 0,
66 REASON_UPDATE_INIT_FAILED, 66 REASON_UPDATE_INIT_FAILED,
67 REASON_UPDATE_NON_CRITICAL, 67 REASON_UPDATE_NON_CRITICAL,
68 REASON_UPDATE_ENDED 68 REASON_UPDATE_ENDED
69 }; 69 };
70 // Reports update results to the ScreenObserver. 70 // Reports update results to the ScreenObserver.
71 virtual void ExitUpdate(ExitReason reason); 71 virtual void ExitUpdate(ExitReason reason);
72 72
73 // UpdateEngineClient::Observer implementation: 73 // UpdateEngineClient::Observer implementation:
74 virtual void UpdateStatusChanged( 74 virtual void UpdateStatusChanged(
75 const UpdateEngineClient::Status& status) OVERRIDE; 75 const UpdateEngineClient::Status& status) override;
76 76
77 // NetworkPortalDetector::Observer implementation: 77 // NetworkPortalDetector::Observer implementation:
78 virtual void OnPortalDetectionCompleted( 78 virtual void OnPortalDetectionCompleted(
79 const NetworkState* network, 79 const NetworkState* network,
80 const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; 80 const NetworkPortalDetector::CaptivePortalState& state) override;
81 81
82 private: 82 private:
83 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic); 83 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);
84 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestUpdateAvailable); 84 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestUpdateAvailable);
85 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestAPReselection); 85 FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestAPReselection);
86 86
87 enum State { 87 enum State {
88 STATE_IDLE = 0, 88 STATE_IDLE = 0,
89 STATE_FIRST_PORTAL_CHECK, 89 STATE_FIRST_PORTAL_CHECK,
90 STATE_UPDATE, 90 STATE_UPDATE,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 bool is_first_portal_notification_; 165 bool is_first_portal_notification_;
166 166
167 base::WeakPtrFactory<UpdateScreen> weak_factory_; 167 base::WeakPtrFactory<UpdateScreen> weak_factory_;
168 168
169 DISALLOW_COPY_AND_ASSIGN(UpdateScreen); 169 DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
170 }; 170 };
171 171
172 } // namespace chromeos 172 } // namespace chromeos
173 173
174 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 174 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698