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

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

Issue 8638016: Add OVERRIDE to chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_NETWORK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/string16.h" 11 #include "base/string16.h"
11 #include "base/task.h" 12 #include "base/task.h"
12 #include "base/timer.h" 13 #include "base/timer.h"
13 #include "chrome/browser/chromeos/cros/network_library.h" 14 #include "chrome/browser/chromeos/cros/network_library.h"
14 #include "chrome/browser/chromeos/login/language_switch_menu.h" 15 #include "chrome/browser/chromeos/login/language_switch_menu.h"
15 #include "chrome/browser/chromeos/login/message_bubble.h" 16 #include "chrome/browser/chromeos/login/message_bubble.h"
16 #include "chrome/browser/chromeos/login/network_screen_actor.h" 17 #include "chrome/browser/chromeos/login/network_screen_actor.h"
17 #include "chrome/browser/chromeos/login/wizard_screen.h" 18 #include "chrome/browser/chromeos/login/wizard_screen.h"
18 19
19 namespace chromeos { 20 namespace chromeos {
20 21
21 class NetworkScreen : public WizardScreen, 22 class NetworkScreen : public WizardScreen,
22 public NetworkLibrary::NetworkManagerObserver, 23 public NetworkLibrary::NetworkManagerObserver,
23 public NetworkScreenActor::Delegate { 24 public NetworkScreenActor::Delegate {
24 public: 25 public:
25 NetworkScreen(ScreenObserver* screen_observer, NetworkScreenActor* actor); 26 NetworkScreen(ScreenObserver* screen_observer, NetworkScreenActor* actor);
26 virtual ~NetworkScreen(); 27 virtual ~NetworkScreen();
27 28
28 // WizardScreen implementation: 29 // WizardScreen implementation:
29 virtual void PrepareToShow(); 30 virtual void PrepareToShow() OVERRIDE;
30 virtual void Show(); 31 virtual void Show() OVERRIDE;
31 virtual void Hide(); 32 virtual void Hide() OVERRIDE;
32 33
33 // NetworkLibrary::NetworkManagerObserver implementation: 34 // NetworkLibrary::NetworkManagerObserver implementation:
34 virtual void OnNetworkManagerChanged(NetworkLibrary* network_lib); 35 virtual void OnNetworkManagerChanged(NetworkLibrary* network_lib) OVERRIDE;
35 36
36 // NetworkScreenActor::Delegate implementation: 37 // NetworkScreenActor::Delegate implementation:
37 virtual void OnContinuePressed(); 38 virtual void OnContinuePressed() OVERRIDE;
38 39
39 NetworkScreenActor* actor() const { return actor_; } 40 NetworkScreenActor* actor() const { return actor_; }
40 41
41 protected: 42 protected:
42 // Subscribes NetworkScreen to the network change notification, 43 // Subscribes NetworkScreen to the network change notification,
43 // forces refresh of current network state. 44 // forces refresh of current network state.
44 virtual void Refresh(); 45 virtual void Refresh();
45 46
46 private: 47 private:
47 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout); 48 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 base::OneShotTimer<NetworkScreen> connection_timer_; 82 base::OneShotTimer<NetworkScreen> connection_timer_;
82 83
83 NetworkScreenActor* actor_; 84 NetworkScreenActor* actor_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(NetworkScreen); 86 DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
86 }; 87 };
87 88
88 } // namespace chromeos 89 } // namespace chromeos
89 90
90 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_ 91 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698