Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

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

Issue 919183002: Move chromeos::device_event_log into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move device_event_log::Initialize call to BrowserProcessImpl. 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
OLDNEW
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.h" 5 #include "chromeos/network/network_state.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chromeos/device_event_log.h"
10 #include "chromeos/network/network_profile_handler.h" 9 #include "chromeos/network/network_profile_handler.h"
11 #include "chromeos/network/network_type_pattern.h" 10 #include "chromeos/network/network_type_pattern.h"
12 #include "chromeos/network/network_util.h" 11 #include "chromeos/network/network_util.h"
13 #include "chromeos/network/onc/onc_utils.h" 12 #include "chromeos/network/onc/onc_utils.h"
14 #include "chromeos/network/shill_property_util.h" 13 #include "chromeos/network/shill_property_util.h"
14 #include "components/device_event_log/device_event_log.h"
15 #include "third_party/cros_system_api/dbus/service_constants.h" 15 #include "third_party/cros_system_api/dbus/service_constants.h"
16 16
17 namespace { 17 namespace {
18 18
19 const char kErrorUnknown[] = "Unknown"; 19 const char kErrorUnknown[] = "Unknown";
20 20
21 bool ConvertListValueToStringVector(const base::ListValue& string_list, 21 bool ConvertListValueToStringVector(const base::ListValue& string_list,
22 std::vector<std::string>* result) { 22 std::vector<std::string>* result) {
23 for (size_t i = 0; i < string_list.GetSize(); ++i) { 23 for (size_t i = 0; i < string_list.GetSize(); ++i) {
24 std::string str; 24 std::string str;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 return IsCaptivePortalState(shill_properties, false /* log */); 370 return IsCaptivePortalState(shill_properties, false /* log */);
371 } 371 }
372 372
373 // static 373 // static
374 bool NetworkState::ErrorIsValid(const std::string& error) { 374 bool NetworkState::ErrorIsValid(const std::string& error) {
375 // Shill uses "Unknown" to indicate an unset or cleared error state. 375 // Shill uses "Unknown" to indicate an unset or cleared error state.
376 return !error.empty() && error != kErrorUnknown; 376 return !error.empty() && error != kErrorUnknown;
377 } 377 }
378 378
379 } // namespace chromeos 379 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698