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

Side by Side Diff: ui/chromeos/network/network_state_notifier.h

Issue 853073002: Update {virtual,override,final} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « ui/chromeos/network/network_list.h ('k') | ui/chromeos/touch_exploration_controller.h » ('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 UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 5 #ifndef UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
6 #define UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 6 #define UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 20 matching lines...) Expand all
31 // 1. ShowNetworkConnectError() gets called after any user initiated connect 31 // 1. ShowNetworkConnectError() gets called after any user initiated connect
32 // failure. This will handle displaying an error notification. 32 // failure. This will handle displaying an error notification.
33 // TODO(stevenjb): convert this class to use the new MessageCenter 33 // TODO(stevenjb): convert this class to use the new MessageCenter
34 // notification system. 34 // notification system.
35 // 2. It observes NetworkState changes to generate notifications when a 35 // 2. It observes NetworkState changes to generate notifications when a
36 // Cellular network is out of credits. 36 // Cellular network is out of credits.
37 class UI_CHROMEOS_EXPORT NetworkStateNotifier : 37 class UI_CHROMEOS_EXPORT NetworkStateNotifier :
38 public chromeos::NetworkStateHandlerObserver { 38 public chromeos::NetworkStateHandlerObserver {
39 public: 39 public:
40 explicit NetworkStateNotifier(NetworkConnect* network_connect); 40 explicit NetworkStateNotifier(NetworkConnect* network_connect);
41 virtual ~NetworkStateNotifier(); 41 ~NetworkStateNotifier() override;
42 42
43 // NetworkStateHandlerObserver 43 // NetworkStateHandlerObserver
44 virtual void DefaultNetworkChanged( 44 void DefaultNetworkChanged(const chromeos::NetworkState* network) override;
45 const chromeos::NetworkState* network) override; 45 void NetworkPropertiesUpdated(const chromeos::NetworkState* network) override;
46 virtual void NetworkPropertiesUpdated(
47 const chromeos::NetworkState* network) override;
48 46
49 // Show a connection error notification. If |error_name| matches an error 47 // Show a connection error notification. If |error_name| matches an error
50 // defined in NetworkConnectionHandler for connect, configure, or activation 48 // defined in NetworkConnectionHandler for connect, configure, or activation
51 // failed, then the associated message is shown; otherwise use the last_error 49 // failed, then the associated message is shown; otherwise use the last_error
52 // value for the network or a Shill property if available. 50 // value for the network or a Shill property if available.
53 void ShowNetworkConnectError(const std::string& error_name, 51 void ShowNetworkConnectError(const std::string& error_name,
54 const std::string& service_path); 52 const std::string& service_path);
55 53
56 // Show a mobile activation error notification. 54 // Show a mobile activation error notification.
57 void ShowMobileActivationError(const std::string& service_path); 55 void ShowMobileActivationError(const std::string& service_path);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 base::Time out_of_credits_notify_time_; 94 base::Time out_of_credits_notify_time_;
97 std::set<std::string> cellular_activating_; 95 std::set<std::string> cellular_activating_;
98 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_; 96 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_;
99 97
100 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier); 98 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier);
101 }; 99 };
102 100
103 } // namespace ui 101 } // namespace ui
104 102
105 #endif // UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 103 #endif // UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_list.h ('k') | ui/chromeos/touch_exploration_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698