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

Side by Side Diff: chromeos/network/network_state.h

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (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 CHROMEOS_NETWORK_NETWORK_STATE_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_
6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_ 6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 20 matching lines...) Expand all
31 // network is visible, and the IsInProfile() method indicates whether the 31 // network is visible, and the IsInProfile() method indicates whether the
32 // network is saved in a profile. 32 // network is saved in a profile.
33 class CHROMEOS_EXPORT NetworkState : public ManagedState { 33 class CHROMEOS_EXPORT NetworkState : public ManagedState {
34 public: 34 public:
35 explicit NetworkState(const std::string& path); 35 explicit NetworkState(const std::string& path);
36 virtual ~NetworkState(); 36 virtual ~NetworkState();
37 37
38 // ManagedState overrides 38 // ManagedState overrides
39 // If you change this method, update GetProperties too. 39 // If you change this method, update GetProperties too.
40 virtual bool PropertyChanged(const std::string& key, 40 virtual bool PropertyChanged(const std::string& key,
41 const base::Value& value) OVERRIDE; 41 const base::Value& value) override;
42 virtual bool InitialPropertiesReceived( 42 virtual bool InitialPropertiesReceived(
43 const base::DictionaryValue& properties) OVERRIDE; 43 const base::DictionaryValue& properties) override;
44 virtual void GetStateProperties( 44 virtual void GetStateProperties(
45 base::DictionaryValue* dictionary) const OVERRIDE; 45 base::DictionaryValue* dictionary) const override;
46 46
47 void IPConfigPropertiesChanged(const base::DictionaryValue& properties); 47 void IPConfigPropertiesChanged(const base::DictionaryValue& properties);
48 48
49 // Returns true, if the network requires a service activation. 49 // Returns true, if the network requires a service activation.
50 bool RequiresActivation() const; 50 bool RequiresActivation() const;
51 51
52 // Accessors 52 // Accessors
53 bool visible() const { return visible_; } 53 bool visible() const { return visible_; }
54 const std::string& security() const { return security_; } 54 const std::string& security() const { return security_; }
55 const std::string& device_path() const { return device_path_; } 55 const std::string& device_path() const { return device_path_; }
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler 180 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
181 // provides proxy configuration. crbug.com/241775 181 // provides proxy configuration. crbug.com/241775
182 base::DictionaryValue proxy_config_; 182 base::DictionaryValue proxy_config_;
183 183
184 DISALLOW_COPY_AND_ASSIGN(NetworkState); 184 DISALLOW_COPY_AND_ASSIGN(NetworkState);
185 }; 185 };
186 186
187 } // namespace chromeos 187 } // namespace chromeos
188 188
189 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 189 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_sms_handler_unittest.cc ('k') | chromeos/network/network_state_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698