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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_stub.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_stub.h" 5 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 9
10 using content::BrowserThread; 10 using content::BrowserThread;
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 const std::string& device_path) {} 475 const std::string& device_path) {}
476 476
477 void NetworkLibraryImplStub::MonitorNetworkDeviceStop( 477 void NetworkLibraryImplStub::MonitorNetworkDeviceStop(
478 const std::string& device_path) {} 478 const std::string& device_path) {}
479 479
480 void NetworkLibraryImplStub::CallConfigureService( 480 void NetworkLibraryImplStub::CallConfigureService(
481 const std::string& identifier, 481 const std::string& identifier,
482 const DictionaryValue* info) {} 482 const DictionaryValue* info) {}
483 483
484 void NetworkLibraryImplStub::CallConnectToNetwork(Network* network) { 484 void NetworkLibraryImplStub::CallConnectToNetwork(Network* network) {
485 // Immediately set the network to active to mimic flimflam's behavior. 485 // Immediately set the network to active to mimic shill's behavior.
486 SetActiveNetwork(network->type(), network->service_path()); 486 SetActiveNetwork(network->type(), network->service_path());
487 // If a delay has been set (i.e. we are interactive), delay the call to 487 // If a delay has been set (i.e. we are interactive), delay the call to
488 // ConnectToNetwork (but signal observers since we changed connecting state). 488 // ConnectToNetwork (but signal observers since we changed connecting state).
489 if (connect_delay_ms_) { 489 if (connect_delay_ms_) {
490 // This class is a Singleton and won't be deleted until this callbacks has 490 // This class is a Singleton and won't be deleted until this callbacks has
491 // run. 491 // run.
492 BrowserThread::PostDelayedTask( 492 BrowserThread::PostDelayedTask(
493 BrowserThread::UI, FROM_HERE, 493 BrowserThread::UI, FROM_HERE,
494 base::Bind(&NetworkLibraryImplStub::ConnectToNetwork, 494 base::Bind(&NetworkLibraryImplStub::ConnectToNetwork,
495 base::Unretained(this), network), 495 base::Unretained(this), network),
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 if (network) 699 if (network)
700 ip_configs_.push_back(NetworkIPConfig(network->device_path(), 700 ip_configs_.push_back(NetworkIPConfig(network->device_path(),
701 IPCONFIG_TYPE_IPV4, 701 IPCONFIG_TYPE_IPV4,
702 address, 702 address,
703 netmask, 703 netmask,
704 gateway, 704 gateway,
705 name_servers)); 705 name_servers));
706 } 706 }
707 707
708 } // namespace chromeos 708 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library_impl_cros.cc ('k') | chrome/browser/chromeos/cros/network_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698