chromeos/network/device_state.cc - Issue 947173002: Remove duplicate includes from chromeos/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chromeos/network/device_state.cc

Issue 947173002: Remove duplicate includes from chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chromeos/network/client_cert_util.cc ('k') | chromeos/network/managed_network_configuration_handler_impl.cc » ('j') | no next file with comments »

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/device_state.h"	5 #include "chromeos/network/device_state.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

9 #include "base/strings/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "base/values.h"

11 #include "chromeos/network/network_event_log.h"	10 #include "chromeos/network/network_event_log.h"

12 #include "chromeos/network/shill_property_util.h"	11 #include "chromeos/network/shill_property_util.h"

13 #include "third_party/cros_system_api/dbus/service_constants.h"	12 #include "third_party/cros_system_api/dbus/service_constants.h"

14	13

15 namespace chromeos {	14 namespace chromeos {

16	15

17 DeviceState::DeviceState(const std::string& path)	16 DeviceState::DeviceState(const std::string& path)

18 : ManagedState(MANAGED_TYPE_DEVICE, path),	17 : ManagedState(MANAGED_TYPE_DEVICE, path),

19 allow_roaming_(false),	18 allow_roaming_(false),

20 provider_requires_roaming_(false),	19 provider_requires_roaming_(false),

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 ip_configs_.SetWithoutPathExpansion(ip_config_path, ip_config);	137 ip_configs_.SetWithoutPathExpansion(ip_config_path, ip_config);

139 }	138 }

140 ip_config->MergeDictionary(&properties);	139 ip_config->MergeDictionary(&properties);

141 }	140 }

142	141

143 bool DeviceState::IsSimAbsent() const {	142 bool DeviceState::IsSimAbsent() const {

144 return technology_family_ == shill::kTechnologyFamilyGsm && !sim_present_;	143 return technology_family_ == shill::kTechnologyFamilyGsm && !sim_present_;

145 }	144 }

146	145

147 } // namespace chromeos	146 } // namespace chromeos

OLD	NEW