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

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

Issue 24348002: Migrate DBus service constants from flimflam namespace to shill namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased to ToT Created 7 years, 2 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 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 error_callback), 137 error_callback),
138 error_callback); 138 error_callback);
139 } 139 }
140 140
141 void ManagedNetworkConfigurationHandlerImpl::GetManagedPropertiesCallback( 141 void ManagedNetworkConfigurationHandlerImpl::GetManagedPropertiesCallback(
142 const network_handler::DictionaryResultCallback& callback, 142 const network_handler::DictionaryResultCallback& callback,
143 const network_handler::ErrorCallback& error_callback, 143 const network_handler::ErrorCallback& error_callback,
144 const std::string& service_path, 144 const std::string& service_path,
145 const base::DictionaryValue& shill_properties) { 145 const base::DictionaryValue& shill_properties) {
146 std::string profile_path; 146 std::string profile_path;
147 shill_properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty, 147 shill_properties.GetStringWithoutPathExpansion(shill::kProfileProperty,
148 &profile_path); 148 &profile_path);
149 const NetworkProfile* profile = 149 const NetworkProfile* profile =
150 network_profile_handler_->GetProfileForPath(profile_path); 150 network_profile_handler_->GetProfileForPath(profile_path);
151 if (!profile) { 151 if (!profile) {
152 LOG(ERROR) << "No or no known profile received for service " 152 LOG(ERROR) << "No or no known profile received for service "
153 << service_path << "."; 153 << service_path << ".";
154 } 154 }
155 155
156 scoped_ptr<NetworkUIData> ui_data = 156 scoped_ptr<NetworkUIData> ui_data =
157 shill_property_util::GetUIDataFromProperties(shill_properties); 157 shill_property_util::GetUIDataFromProperties(shill_properties);
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 void ManagedNetworkConfigurationHandlerImpl::OnPolicyApplied( 553 void ManagedNetworkConfigurationHandlerImpl::OnPolicyApplied(
554 const std::string& service_path) { 554 const std::string& service_path) {
555 if (service_path.empty()) 555 if (service_path.empty())
556 return; 556 return;
557 FOR_EACH_OBSERVER( 557 FOR_EACH_OBSERVER(
558 NetworkPolicyObserver, observers_, PolicyApplied(service_path)); 558 NetworkPolicyObserver, observers_, PolicyApplied(service_path));
559 } 559 }
560 560
561 } // namespace chromeos 561 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/geolocation_handler_unittest.cc ('k') | chromeos/network/managed_network_configuration_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698