| 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_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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/macros.h" |
| 13 #include "base/values.h" | 14 #include "base/values.h" |
| 14 #include "chromeos/network/managed_state.h" | 15 #include "chromeos/network/managed_state.h" |
| 15 #include "components/onc/onc_constants.h" | 16 #include "components/onc/onc_constants.h" |
| 16 #include "url/gurl.h" | 17 #include "url/gurl.h" |
| 17 | 18 |
| 18 namespace base { | 19 namespace base { |
| 19 class DictionaryValue; | 20 class DictionaryValue; |
| 20 class Value; | 21 class Value; |
| 21 } | 22 } |
| 22 | 23 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler | 203 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler |
| 203 // provides proxy configuration. crbug.com/241775 | 204 // provides proxy configuration. crbug.com/241775 |
| 204 base::DictionaryValue proxy_config_; | 205 base::DictionaryValue proxy_config_; |
| 205 | 206 |
| 206 DISALLOW_COPY_AND_ASSIGN(NetworkState); | 207 DISALLOW_COPY_AND_ASSIGN(NetworkState); |
| 207 }; | 208 }; |
| 208 | 209 |
| 209 } // namespace chromeos | 210 } // namespace chromeos |
| 210 | 211 |
| 211 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ | 212 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| OLD | NEW |