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

Side by Side Diff: ash/system/chromeos/network/network_state_notifier.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 22 matching lines...) Expand all
33 // 2. It observes NetworkState changes to generate notifications when a 33 // 2. It observes NetworkState changes to generate notifications when a
34 // Cellular network is out of credits. 34 // Cellular network is out of credits.
35 class ASH_EXPORT NetworkStateNotifier : 35 class ASH_EXPORT NetworkStateNotifier :
36 public chromeos::NetworkStateHandlerObserver { 36 public chromeos::NetworkStateHandlerObserver {
37 public: 37 public:
38 NetworkStateNotifier(); 38 NetworkStateNotifier();
39 virtual ~NetworkStateNotifier(); 39 virtual ~NetworkStateNotifier();
40 40
41 // NetworkStateHandlerObserver 41 // NetworkStateHandlerObserver
42 virtual void DefaultNetworkChanged( 42 virtual void DefaultNetworkChanged(
43 const chromeos::NetworkState* network) OVERRIDE; 43 const chromeos::NetworkState* network) override;
44 virtual void NetworkPropertiesUpdated( 44 virtual void NetworkPropertiesUpdated(
45 const chromeos::NetworkState* network) OVERRIDE; 45 const chromeos::NetworkState* network) override;
46 46
47 // Show a connection error notification. If |error_name| matches an error 47 // Show a connection error notification. If |error_name| matches an error
48 // defined in NetworkConnectionHandler for connect, configure, or activation 48 // defined in NetworkConnectionHandler for connect, configure, or activation
49 // 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
50 // value for the network or a Shill property if available. 50 // value for the network or a Shill property if available.
51 void ShowNetworkConnectError(const std::string& error_name, 51 void ShowNetworkConnectError(const std::string& error_name,
52 const std::string& service_path); 52 const std::string& service_path);
53 53
54 private: 54 private:
55 void ConnectErrorPropertiesSucceeded( 55 void ConnectErrorPropertiesSucceeded(
(...skipping 22 matching lines...) Expand all
78 base::Time out_of_credits_notify_time_; 78 base::Time out_of_credits_notify_time_;
79 std::set<std::string> cellular_activating_; 79 std::set<std::string> cellular_activating_;
80 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_; 80 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier); 82 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier);
83 }; 83 };
84 84
85 } // namespace ash 85 } // namespace ash
86 86
87 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ 87 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698