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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_network_functions_unittest.cc » ('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 (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/cros_network_functions.h" 5 #include "chrome/browser/chromeos/cros/cros_network_functions.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/cros/gvalue_util.h" 10 #include "chrome/browser/chromeos/cros/gvalue_util.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 void CrosRequestChangePin(const std::string& device_path, 625 void CrosRequestChangePin(const std::string& device_path,
626 const std::string& old_pin, 626 const std::string& old_pin,
627 const std::string& new_pin, 627 const std::string& new_pin,
628 NetworkActionCallback callback, 628 NetworkActionCallback callback,
629 void* object) { 629 void* object) {
630 chromeos::RequestChangePin(device_path.c_str(), old_pin.c_str(), 630 chromeos::RequestChangePin(device_path.c_str(), old_pin.c_str(),
631 new_pin.c_str(), callback, object); 631 new_pin.c_str(), callback, object);
632 } 632 }
633 633
634 void CrosProposeScan(const std::string& device_path) { 634 void CrosProposeScan(const std::string& device_path) {
635 chromeos::ProposeScan(device_path.c_str()); 635 if (g_libcros_network_functions_enabled) {
636 chromeos::ProposeScan(device_path.c_str());
637 } else {
638 DBusThreadManager::Get()->GetFlimflamDeviceClient()->ProposeScan(
639 dbus::ObjectPath(device_path), base::Bind(&DoNothing));
640 }
636 } 641 }
637 642
638 void CrosRequestCellularRegister(const std::string& device_path, 643 void CrosRequestCellularRegister(const std::string& device_path,
639 const std::string& network_id, 644 const std::string& network_id,
640 chromeos::NetworkActionCallback callback, 645 chromeos::NetworkActionCallback callback,
641 void* object) { 646 void* object) {
642 chromeos::RequestCellularRegister(device_path.c_str(), network_id.c_str(), 647 chromeos::RequestCellularRegister(device_path.c_str(), network_id.c_str(),
643 callback, object); 648 callback, object);
644 } 649 }
645 650
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 ScopedGHashTable ghash( 738 ScopedGHashTable ghash(
734 ConvertDictionaryValueToStringValueGHashTable(properties)); 739 ConvertDictionaryValueToStringValueGHashTable(properties));
735 chromeos::ConfigureService("", ghash.get(), OnConfigureService, NULL); 740 chromeos::ConfigureService("", ghash.get(), OnConfigureService, NULL);
736 } else { 741 } else {
737 DBusThreadManager::Get()->GetFlimflamManagerClient()->ConfigureService( 742 DBusThreadManager::Get()->GetFlimflamManagerClient()->ConfigureService(
738 properties, base::Bind(&DoNothing)); 743 properties, base::Bind(&DoNothing));
739 } 744 }
740 } 745 }
741 746
742 } // namespace chromeos 747 } // namespace chromeos
OLDNEW
« 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