OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_type_pattern.h" | 5 #include "chromeos/network/network_type_pattern.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "chromeos/network/network_event_log.h" | 9 #include "chromeos/network/network_event_log.h" |
10 #include "third_party/cros_system_api/dbus/service_constants.h" | 10 #include "third_party/cros_system_api/dbus/service_constants.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 kNetworkTypeCellular); | 67 kNetworkTypeCellular); |
68 } | 68 } |
69 | 69 |
70 // static | 70 // static |
71 NetworkTypePattern NetworkTypePattern::Mobile() { | 71 NetworkTypePattern NetworkTypePattern::Mobile() { |
72 return NetworkTypePattern(kNetworkTypeCellular | kNetworkTypeWimax); | 72 return NetworkTypePattern(kNetworkTypeCellular | kNetworkTypeWimax); |
73 } | 73 } |
74 | 74 |
75 // static | 75 // static |
76 NetworkTypePattern NetworkTypePattern::NonVirtual() { | 76 NetworkTypePattern NetworkTypePattern::NonVirtual() { |
77 return NetworkTypePattern(~(kNetworkTypeVPN | kNetworkTypeTether)); | 77 return NetworkTypePattern(~kNetworkTypeVPN); |
Ryan Hansberry
2017/02/15 19:57:39
I changed this in order for the Tether pattern to
stevenjb
2017/02/15 20:59:04
I'm worried about other uses of NetworkTypePattern
Ryan Hansberry
2017/02/16 22:42:20
Got it. Undid this, and changed NetworkListMd::Upd
| |
78 } | 78 } |
79 | 79 |
80 // static | 80 // static |
81 NetworkTypePattern NetworkTypePattern::Ethernet() { | 81 NetworkTypePattern NetworkTypePattern::Ethernet() { |
82 return NetworkTypePattern(kNetworkTypeEthernet); | 82 return NetworkTypePattern(kNetworkTypeEthernet); |
83 } | 83 } |
84 | 84 |
85 // static | 85 // static |
86 NetworkTypePattern NetworkTypePattern::WiFi() { | 86 NetworkTypePattern NetworkTypePattern::WiFi() { |
87 return NetworkTypePattern(kNetworkTypeWifi); | 87 return NetworkTypePattern(kNetworkTypeWifi); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
149 if (!str.empty()) | 149 if (!str.empty()) |
150 str += "|"; | 150 str += "|"; |
151 str += shill_type_to_flag[i].shill_network_type; | 151 str += shill_type_to_flag[i].shill_network_type; |
152 } | 152 } |
153 return str; | 153 return str; |
154 } | 154 } |
155 | 155 |
156 NetworkTypePattern::NetworkTypePattern(int pattern) : pattern_(pattern) {} | 156 NetworkTypePattern::NetworkTypePattern(int pattern) : pattern_(pattern) {} |
157 | 157 |
158 } // namespace chromeos | 158 } // namespace chromeos |
OLD | NEW |