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 #include "chromeos/network/network_state_handler.h" | 5 #include "chromeos/network/network_state_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/format_macros.h" | 8 #include "base/format_macros.h" |
9 #include "base/guid.h" | 9 #include "base/guid.h" |
10 #include "base/json/json_string_value_serializer.h" | 10 #include "base/json/json_string_value_serializer.h" |
11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "base/values.h" | 18 #include "base/values.h" |
19 #include "chromeos/network/device_state.h" | 19 #include "chromeos/network/device_state.h" |
20 #include "chromeos/network/managed_state.h" | |
21 #include "chromeos/network/network_event_log.h" | 20 #include "chromeos/network/network_event_log.h" |
22 #include "chromeos/network/network_state.h" | 21 #include "chromeos/network/network_state.h" |
23 #include "chromeos/network/network_state_handler_observer.h" | 22 #include "chromeos/network/network_state_handler_observer.h" |
24 #include "chromeos/network/shill_property_handler.h" | |
25 #include "third_party/cros_system_api/dbus/service_constants.h" | 23 #include "third_party/cros_system_api/dbus/service_constants.h" |
26 | 24 |
27 namespace chromeos { | 25 namespace chromeos { |
28 | 26 |
29 namespace { | 27 namespace { |
30 | 28 |
31 bool ConnectionStateChanged(NetworkState* network, | 29 bool ConnectionStateChanged(NetworkState* network, |
32 const std::string& prev_connection_state, | 30 const std::string& prev_connection_state, |
33 bool prev_is_captive_portal) { | 31 bool prev_is_captive_portal) { |
34 return ((network->connection_state() != prev_connection_state) && | 32 return ((network->connection_state() != prev_connection_state) && |
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
968 if (type.MatchesType(shill::kTypeBluetooth)) | 966 if (type.MatchesType(shill::kTypeBluetooth)) |
969 technologies.push_back(new std::string(shill::kTypeBluetooth)); | 967 technologies.push_back(new std::string(shill::kTypeBluetooth)); |
970 if (type.MatchesType(shill::kTypeVPN)) | 968 if (type.MatchesType(shill::kTypeVPN)) |
971 technologies.push_back(new std::string(shill::kTypeVPN)); | 969 technologies.push_back(new std::string(shill::kTypeVPN)); |
972 | 970 |
973 CHECK_GT(technologies.size(), 0ul); | 971 CHECK_GT(technologies.size(), 0ul); |
974 return technologies.Pass(); | 972 return technologies.Pass(); |
975 } | 973 } |
976 | 974 |
977 } // namespace chromeos | 975 } // namespace chromeos |
OLD | NEW |