Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_MANAGED_STATE_H_ | 5 #ifndef CHROMEOS_NETWORK_MANAGED_STATE_H_ |
| 6 #define CHROMEOS_NETWORK_MANAGED_STATE_H_ | 6 #define CHROMEOS_NETWORK_MANAGED_STATE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/gtest_prod_util.h" | |
|
Kyle Horimoto
2017/04/27 01:28:08
Remove.
lesliewatkins
2017/04/28 21:30:43
Done.
| |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "chromeos/chromeos_export.h" | 16 #include "chromeos/chromeos_export.h" |
| 16 | 17 |
| 18 namespace ash { | |
| 19 namespace network_icon { | |
| 20 class NetworkIconTest; | |
| 21 } | |
|
Ryan Hansberry
2017/04/27 16:32:27
nit: close namespaces with comments. e.g. '} // n
lesliewatkins
2017/04/28 21:30:43
Even for the little namespaces where you can easil
| |
| 22 } | |
| 23 | |
| 17 namespace base { | 24 namespace base { |
| 18 class Value; | 25 class Value; |
| 19 class DictionaryValue; | 26 class DictionaryValue; |
| 20 } | 27 } |
| 21 | 28 |
| 22 namespace chromeos { | 29 namespace chromeos { |
| 23 | 30 |
| 24 class DeviceState; | 31 class DeviceState; |
| 25 class NetworkState; | 32 class NetworkState; |
| 26 class NetworkTypePattern; | 33 class NetworkTypePattern; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 bool GetUInt32Value(const std::string& key, | 113 bool GetUInt32Value(const std::string& key, |
| 107 const base::Value& value, | 114 const base::Value& value, |
| 108 uint32_t* out_value); | 115 uint32_t* out_value); |
| 109 | 116 |
| 110 void set_name(const std::string& name) { name_ = name; } | 117 void set_name(const std::string& name) { name_ = name; } |
| 111 void set_type(const std::string& type) { type_ = type; } | 118 void set_type(const std::string& type) { type_ = type; } |
| 112 | 119 |
| 113 private: | 120 private: |
| 114 friend class NetworkChangeNotifierChromeosUpdateTest; | 121 friend class NetworkChangeNotifierChromeosUpdateTest; |
| 115 friend class NetworkStateHandler; | 122 friend class NetworkStateHandler; |
| 123 friend class ash::network_icon::NetworkIconTest; | |
| 116 | 124 |
| 117 ManagedType managed_type_; | 125 ManagedType managed_type_; |
| 118 | 126 |
| 119 // The path (e.g. service path or device path) of the managed state object. | 127 // The path (e.g. service path or device path) of the managed state object. |
| 120 std::string path_; | 128 std::string path_; |
| 121 | 129 |
| 122 // Common properties shared by all managed state objects. | 130 // Common properties shared by all managed state objects. |
| 123 std::string name_; // shill::kNameProperty | 131 std::string name_; // shill::kNameProperty |
| 124 std::string type_; // shill::kTypeProperty | 132 std::string type_; // shill::kTypeProperty |
| 125 | 133 |
| 126 // Set to true when the an update has been received. | 134 // Set to true when the an update has been received. |
| 127 bool update_received_; | 135 bool update_received_; |
| 128 | 136 |
| 129 // Tracks when an update has been requested. | 137 // Tracks when an update has been requested. |
| 130 bool update_requested_; | 138 bool update_requested_; |
| 131 | 139 |
| 132 DISALLOW_COPY_AND_ASSIGN(ManagedState); | 140 DISALLOW_COPY_AND_ASSIGN(ManagedState); |
| 133 }; | 141 }; |
| 134 | 142 |
| 135 } // namespace chromeos | 143 } // namespace chromeos |
| 136 | 144 |
| 137 #endif // CHROMEOS_NETWORK_MANAGED_STATE_H_ | 145 #endif // CHROMEOS_NETWORK_MANAGED_STATE_H_ |
| OLD | NEW |