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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
12 #include "base/guid.h" | 12 #include "base/guid.h" |
13 #include "base/json/json_string_value_serializer.h" | 13 #include "base/json/json_string_value_serializer.h" |
14 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
15 #include "base/location.h" | 15 #include "base/location.h" |
16 #include "base/logging.h" | 16 #include "base/logging.h" |
17 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
18 #include "base/metrics/histogram_macros.h" | 18 #include "base/metrics/histogram_macros.h" |
19 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
20 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
21 #include "base/strings/stringprintf.h" | 21 #include "base/strings/stringprintf.h" |
22 #include "base/values.h" | 22 #include "base/values.h" |
23 #include "chromeos/chromeos_switches.h" | 23 #include "chromeos/chromeos_switches.h" |
24 #include "chromeos/network/device_state.h" | 24 #include "chromeos/network/device_state.h" |
25 #include "chromeos/network/network_event_log.h" | 25 #include "chromeos/network/network_event_log.h" |
26 #include "chromeos/network/network_state.h" | 26 #include "chromeos/network/network_state.h" |
27 #include "chromeos/network/network_state_handler_observer.h" | 27 #include "chromeos/network/network_state_handler_observer.h" |
| 28 #include "chromeos/network/tether_constants.h" |
28 #include "third_party/cros_system_api/dbus/service_constants.h" | 29 #include "third_party/cros_system_api/dbus/service_constants.h" |
29 | 30 |
30 namespace chromeos { | 31 namespace chromeos { |
31 | 32 |
32 namespace { | 33 namespace { |
33 | 34 |
34 bool ConnectionStateChanged(NetworkState* network, | 35 bool ConnectionStateChanged(NetworkState* network, |
35 const std::string& prev_connection_state, | 36 const std::string& prev_connection_state, |
36 bool prev_is_captive_portal) { | 37 bool prev_is_captive_portal) { |
37 return ((network->connection_state() != prev_connection_state) && | 38 return ((network->connection_state() != prev_connection_state) && |
(...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1168 if (type.MatchesType(shill::kTypeBluetooth)) | 1169 if (type.MatchesType(shill::kTypeBluetooth)) |
1169 technologies.emplace_back(shill::kTypeBluetooth); | 1170 technologies.emplace_back(shill::kTypeBluetooth); |
1170 if (type.MatchesType(shill::kTypeVPN)) | 1171 if (type.MatchesType(shill::kTypeVPN)) |
1171 technologies.emplace_back(shill::kTypeVPN); | 1172 technologies.emplace_back(shill::kTypeVPN); |
1172 | 1173 |
1173 CHECK_GT(technologies.size(), 0ul); | 1174 CHECK_GT(technologies.size(), 0ul); |
1174 return technologies; | 1175 return technologies; |
1175 } | 1176 } |
1176 | 1177 |
1177 } // namespace chromeos | 1178 } // namespace chromeos |
OLD | NEW |