OLD | NEW |
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 <vector> | 8 #include <vector> |
9 #include <cstring> | 9 #include <cstring> |
10 | 10 |
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 delete [] system->remembered_services; | 797 delete [] system->remembered_services; |
798 } | 798 } |
799 delete system; | 799 delete system; |
800 } | 800 } |
801 | 801 |
802 extern "C" | 802 extern "C" |
803 void ChromeOSFreeServiceInfo(ServiceInfo* info) { | 803 void ChromeOSFreeServiceInfo(ServiceInfo* info) { |
804 if (info == NULL) | 804 if (info == NULL) |
805 return; | 805 return; |
806 DeleteServiceInfoProperties(*info); | 806 DeleteServiceInfoProperties(*info); |
| 807 delete info; |
807 } | 808 } |
808 | 809 |
809 // TODO(ers) ManagerPropertyChangedHandler is deprecated | 810 // TODO(ers) ManagerPropertyChangedHandler is deprecated |
810 class ManagerPropertyChangedHandler { | 811 class ManagerPropertyChangedHandler { |
811 public: | 812 public: |
812 typedef dbus::MonitorConnection<void(const char*, const glib::Value*)>* | 813 typedef dbus::MonitorConnection<void(const char*, const glib::Value*)>* |
813 MonitorConnection; | 814 MonitorConnection; |
814 | 815 |
815 ManagerPropertyChangedHandler(const MonitorNetworkCallback& callback, | 816 ManagerPropertyChangedHandler(const MonitorNetworkCallback& callback, |
816 void* object) | 817 void* object) |
(...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2183 } | 2184 } |
2184 DCHECK(properties_array); | 2185 DCHECK(properties_array); |
2185 | 2186 |
2186 ParseCellularDataPlanList(properties_array, data_plan_list); | 2187 ParseCellularDataPlanList(properties_array, data_plan_list); |
2187 g_ptr_array_unref(properties_array); | 2188 g_ptr_array_unref(properties_array); |
2188 return true; | 2189 return true; |
2189 } | 2190 } |
2190 | 2191 |
2191 | 2192 |
2192 } // namespace chromeos | 2193 } // namespace chromeos |
OLD | NEW |