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

Side by Side Diff: chromeos_network.cc

Issue 6624026: libcros: fix up DBus signatures of new async routines (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cros.git@master
Patch Set: Rebase Created 9 years, 9 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 | no next file » | 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) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS 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.h" // NOLINT 5 #include "chromeos_network.h" // NOLINT
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 #include <list> 9 #include <list>
10 #include <set> 10 #include <set>
(...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1471 DCHECK(service_path && callback); 1471 DCHECK(service_path && callback);
1472 NetworkActionCallbackData* cb_data = new NetworkActionCallbackData( 1472 NetworkActionCallbackData* cb_data = new NetworkActionCallbackData(
1473 kFlimflamServiceInterface, service_path, service_path, callback, object); 1473 kFlimflamServiceInterface, service_path, service_path, callback, object);
1474 1474
1475 DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call( 1475 DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
1476 cb_data->proxy->gproxy(), 1476 cb_data->proxy->gproxy(),
1477 kConnectFunction, 1477 kConnectFunction,
1478 &NetworkServiceConnectNotify, 1478 &NetworkServiceConnectNotify,
1479 cb_data, 1479 cb_data,
1480 &DeleteFlimflamCallbackData, 1480 &DeleteFlimflamCallbackData,
1481 DBUS_TYPE_G_OBJECT_PATH,
1482 &service_path,
1483 G_TYPE_INVALID); 1481 G_TYPE_INVALID);
1484 if (!call_id) { 1482 if (!call_id) {
1485 LOG(ERROR) << "NULL call_id for: " << kFlimflamServiceInterface 1483 LOG(ERROR) << "NULL call_id for: " << kFlimflamServiceInterface
1486 << " : " << service_path; 1484 << " : " << service_path;
1487 callback(object, service_path, NETWORK_METHOD_ERROR_LOCAL, 1485 callback(object, service_path, NETWORK_METHOD_ERROR_LOCAL,
1488 "dbus: NULL call_id"); 1486 "dbus: NULL call_id");
1489 delete cb_data; 1487 delete cb_data;
1490 } 1488 }
1491 } 1489 }
1492 1490
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 // it completes and log any errors. 1687 // it completes and log any errors.
1690 scoped_ptr<glib::Value> gsetting(ConvertToGlibValue(setting)); 1688 scoped_ptr<glib::Value> gsetting(ConvertToGlibValue(setting));
1691 DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call( 1689 DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
1692 cb_data->proxy->gproxy(), 1690 cb_data->proxy->gproxy(),
1693 kSetPropertyFunction, 1691 kSetPropertyFunction,
1694 &FlimflamNotifyHandleError, 1692 &FlimflamNotifyHandleError,
1695 cb_data, 1693 cb_data,
1696 &DeleteFlimflamCallbackData, 1694 &DeleteFlimflamCallbackData,
1697 G_TYPE_STRING, 1695 G_TYPE_STRING,
1698 property, 1696 property,
1699 G_VALUE_TYPE(gsetting.get()), 1697 G_TYPE_VALUE,
1700 gsetting.get(), 1698 gsetting.get(),
1701 G_TYPE_INVALID); 1699 G_TYPE_INVALID);
1702 if (!call_id) { 1700 if (!call_id) {
1703 LOG(ERROR) << "NULL call_id for: " << kRequestScanFunction; 1701 LOG(ERROR) << "NULL call_id for: " << kRequestScanFunction;
1704 delete cb_data; 1702 delete cb_data;
1705 } 1703 }
1706 } 1704 }
1707 1705
1708 // Cashew services 1706 // Cashew services
1709 1707
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 } 1861 }
1864 DCHECK(properties_array); 1862 DCHECK(properties_array);
1865 1863
1866 CellularDataPlanList *data_plan_list = 1864 CellularDataPlanList *data_plan_list =
1867 ParseCellularDataPlanList(properties_array); 1865 ParseCellularDataPlanList(properties_array);
1868 g_ptr_array_unref(properties_array); 1866 g_ptr_array_unref(properties_array);
1869 return data_plan_list; 1867 return data_plan_list;
1870 } 1868 }
1871 1869
1872 } // namespace chromeos 1870 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698