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

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

Issue 799313004: chromeos networking: small cleanups (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: Created 5 years, 11 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 | « no previous file | chromeos/network/network_configuration_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/managed_network_configuration_handler_impl.h" 5 #include "chromeos/network/managed_network_configuration_handler_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 namespace { 44 namespace {
45 45
46 using GuidToPolicyMap = ManagedNetworkConfigurationHandler::GuidToPolicyMap; 46 using GuidToPolicyMap = ManagedNetworkConfigurationHandler::GuidToPolicyMap;
47 47
48 // These are error strings used for error callbacks. None of these error 48 // These are error strings used for error callbacks. None of these error
49 // messages are user-facing: they should only appear in logs. 49 // messages are user-facing: they should only appear in logs.
50 const char kInvalidUserSettings[] = "InvalidUserSettings"; 50 const char kInvalidUserSettings[] = "InvalidUserSettings";
51 const char kNetworkAlreadyConfigured[] = "NetworkAlreadyConfigured"; 51 const char kNetworkAlreadyConfigured[] = "NetworkAlreadyConfigured";
52 const char kPoliciesNotInitialized[] = "PoliciesNotInitialized"; 52 const char kPoliciesNotInitialized[] = "PoliciesNotInitialized";
53 const char kProfileNotInitialized[] = "ProflieNotInitialized"; 53 const char kProfileNotInitialized[] = "ProfileNotInitialized";
54 const char kSetOnUnconfiguredNetwork[] = "SetCalledOnUnconfiguredNetwork"; 54 const char kSetOnUnconfiguredNetwork[] = "SetCalledOnUnconfiguredNetwork";
55 const char kUnknownProfilePath[] = "UnknownProfilePath"; 55 const char kUnknownProfilePath[] = "UnknownProfilePath";
56 const char kUnknownNetwork[] = "UnknownNetwork"; 56 const char kUnknownNetwork[] = "UnknownNetwork";
57 57
58 std::string ToDebugString(::onc::ONCSource source, 58 std::string ToDebugString(::onc::ONCSource source,
59 const std::string& userhash) { 59 const std::string& userhash) {
60 return source == ::onc::ONC_SOURCE_USER_POLICY ? 60 return source == ::onc::ONC_SOURCE_USER_POLICY ?
61 ("user policy of " + userhash) : "device policy"; 61 ("user policy of " + userhash) : "device policy";
62 } 62 }
63 63
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 scoped_ptr<base::DictionaryValue> network_properties, 795 scoped_ptr<base::DictionaryValue> network_properties,
796 GetDevicePropertiesCallback send_callback, 796 GetDevicePropertiesCallback send_callback,
797 const std::string& error_name, 797 const std::string& error_name,
798 scoped_ptr<base::DictionaryValue> error_data) { 798 scoped_ptr<base::DictionaryValue> error_data) {
799 NET_LOG_ERROR("Error getting device properties", service_path); 799 NET_LOG_ERROR("Error getting device properties", service_path);
800 send_callback.Run(service_path, network_properties.Pass()); 800 send_callback.Run(service_path, network_properties.Pass());
801 } 801 }
802 802
803 803
804 } // namespace chromeos 804 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/network_configuration_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698