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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_cros.cc

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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 "chrome/browser/chromeos/cros/network_library_impl_cros.h" 5 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h"
6 6
7 #include <dbus/dbus-glib.h> 7 #include <dbus/dbus-glib.h>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_writer.h" // for debug output only. 10 #include "base/json/json_writer.h" // for debug output only.
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 LOG(ERROR) << "'Entries' property is missing."; 991 LOG(ERROR) << "'Entries' property is missing.";
992 return; 992 return;
993 } 993 }
994 994
995 NetworkProfileList::iterator iter1; 995 NetworkProfileList::iterator iter1;
996 for (iter1 = profile_list_.begin(); iter1 != profile_list_.end(); ++iter1) { 996 for (iter1 = profile_list_.begin(); iter1 != profile_list_.end(); ++iter1) {
997 if (iter1->path == profile_path) 997 if (iter1->path == profile_path)
998 break; 998 break;
999 } 999 }
1000 if (iter1 == profile_list_.end()) { 1000 if (iter1 == profile_list_.end()) {
1001 // This can happen if flimflam gets restarted while Chrome is running. 1001 // This can happen if shill gets restarted while Chrome is running.
1002 LOG(WARNING) << "Profile not in list: " << profile_path; 1002 LOG(WARNING) << "Profile not in list: " << profile_path;
1003 return; 1003 return;
1004 } 1004 }
1005 NetworkProfile& profile = *iter1; 1005 NetworkProfile& profile = *iter1;
1006 // |profile_entries| is a list of remembered networks from |profile_path|. 1006 // |profile_entries| is a list of remembered networks from |profile_path|.
1007 profile.services.clear(); 1007 profile.services.clear();
1008 for (ListValue::const_iterator iter2 = profile_entries->begin(); 1008 for (ListValue::const_iterator iter2 = profile_entries->begin();
1009 iter2 != profile_entries->end(); ++iter2) { 1009 iter2 != profile_entries->end(); ++iter2) {
1010 std::string service_path; 1010 std::string service_path;
1011 (*iter2)->GetAsString(&service_path); 1011 (*iter2)->GetAsString(&service_path);
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 // Find the network associated with this service path, and attempt to refresh 1280 // Find the network associated with this service path, and attempt to refresh
1281 // its IP parameters, so that the changes to the service properties can take 1281 // its IP parameters, so that the changes to the service properties can take
1282 // effect. 1282 // effect.
1283 Network* network = FindNetworkByPath(service_path); 1283 Network* network = FindNetworkByPath(service_path);
1284 1284
1285 if (network && network->connecting_or_connected()) 1285 if (network && network->connecting_or_connected())
1286 RefreshIPConfig(network); 1286 RefreshIPConfig(network);
1287 } 1287 }
1288 1288
1289 } // namespace chromeos 1289 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library_impl_base.cc ('k') | chrome/browser/chromeos/cros/network_library_impl_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698