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

Unified Diff: chrome/browser/chromeos/cros/cros_network_functions.cc

Issue 10162027: Reimplement CrosProposeScan without Libcros (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_network_functions_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/cros_network_functions.cc
diff --git a/chrome/browser/chromeos/cros/cros_network_functions.cc b/chrome/browser/chromeos/cros/cros_network_functions.cc
index 41efb4a300be58ad8af3ae1c63517310620839b9..ea8dac2f66c031db1cdbcf85d4019717a21789ac 100644
--- a/chrome/browser/chromeos/cros/cros_network_functions.cc
+++ b/chrome/browser/chromeos/cros/cros_network_functions.cc
@@ -632,7 +632,12 @@ void CrosRequestChangePin(const std::string& device_path,
}
void CrosProposeScan(const std::string& device_path) {
- chromeos::ProposeScan(device_path.c_str());
+ if (g_libcros_network_functions_enabled) {
+ chromeos::ProposeScan(device_path.c_str());
+ } else {
+ DBusThreadManager::Get()->GetFlimflamDeviceClient()->ProposeScan(
+ dbus::ObjectPath(device_path), base::Bind(&DoNothing));
+ }
}
void CrosRequestCellularRegister(const std::string& device_path,
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_network_functions_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698