Eliminate ConenctionType, etc from chromeos_network.h

load.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstdio>
 #include <dlfcn.h>
 #include <string.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 202 matching lines @@
             MonitorPropertyCallback, void*);
 DECL_FUNC_1(DisconnectPropertyChangeMonitor, void, PropertyChangeMonitor);
 DECL_FUNC_3(MonitorNetworkService, PropertyChangeMonitor,
             MonitorPropertyCallback, const char*, void*);
 DECL_FUNC_2(MonitorCellularDataPlan, DataPlanUpdateMonitor,
             MonitorDataPlanCallback, void*);
 DECL_FUNC_1(DisconnectDataPlanUpdateMonitor, void, DataPlanUpdateMonitor);
 DECL_FUNC_1(RetrieveCellularDataPlans, CellularDataPlanList*, const char*);
 DECL_FUNC_1(RequestCellularDataPlanUpdate, void, const char*);
 DECL_FUNC_1(FreeCellularDataPlanList, void, CellularDataPlanList*);
-DECL_FUNC_3(RequestServiceConnect, void, const char*, NetworkActionCallback,
-            void *);
+DECL_FUNC_3(RequestNetworkServiceConnect, void, const char*,
+            NetworkActionCallback, void *);

[stevenjb, 2011/03/02 23:35:57]

Note: This was renamed during a previous CL but not changed here. (libcros
compiles, it is only a runtime error, caught during testing Chrome changes).

 DECL_FUNC_2(RequestNetworkManagerInfo, void,
             NetworkPropertiesCallback, void*);
 DECL_FUNC_3(RequestNetworkServiceInfo, void, const char*,
             NetworkPropertiesCallback, void*);
 DECL_FUNC_3(RequestNetworkDeviceInfo, void, const char*,
             NetworkPropertiesCallback, void*);
 DECL_FUNC_3(RequestNetworkProfile, void, const char*,
             NetworkPropertiesCallback, void*);
 DECL_FUNC_4(RequestNetworkProfileEntry, void, const char*, const char*,
             NetworkPropertiesCallback, void*);
 DECL_FUNC_4(RequestWifiServicePath, void, const char*, ConnectionSecurity,
             NetworkPropertiesCallback, void*);
+DECL_FUNC_4(RequestHiddenWifiNetwork, void, const char*, const char*,
+            NetworkPropertiesCallback, void*);
+DECL_FUNC_1(RequestNetworkScan, void, const char*);
+DECL_FUNC_2(RequestNetworkDeviceEnable, void, const char*, bool);
 DECL_FUNC_2(EnableNetworkDevice, bool, ConnectionType, bool);
 DECL_FUNC_1(SetOfflineMode, bool, bool);
 DECL_FUNC_2(SetAutoConnect, bool, const char*, bool);
 DECL_FUNC_2(SetPassphrase, bool, const char*, const char*);
 DECL_FUNC_2(SetIdentity, bool, const char*, const char*);
 DECL_FUNC_2(SetCertPath, bool, const char*, const char*);
 DECL_FUNC_1(ListIPConfigs, IPConfigStatus*, const char*);
 DECL_FUNC_2(AddIPConfig, bool, const char*, IPConfigType);
 DECL_FUNC_1(SaveIPConfig, bool, IPConfig*);
 DECL_FUNC_1(RemoveIPConfig, bool, IPConfig*);
@@ skipping 284 matching lines @@
   INIT_FUNC(RemoveIPConfig);
   INIT_FUNC(FreeIPConfig);
   INIT_FUNC(FreeIPConfigStatus);
   INIT_FUNC(GetDeviceNetworkList);
   INIT_FUNC(FreeDeviceNetworkList);
   INIT_FUNC(MonitorCellularDataPlan);
   INIT_FUNC(DisconnectDataPlanUpdateMonitor);
   INIT_FUNC(RetrieveCellularDataPlans);
   INIT_FUNC(RequestCellularDataPlanUpdate);
   INIT_FUNC(FreeCellularDataPlanList);
-  INIT_FUNC(RequestServiceConnect);
+  INIT_FUNC(RequestNetworkServiceConnect);
   INIT_FUNC(RequestNetworkManagerInfo);
   INIT_FUNC(RequestNetworkServiceInfo);
   INIT_FUNC(RequestNetworkDeviceInfo);
   INIT_FUNC(RequestNetworkProfile);
   INIT_FUNC(RequestNetworkProfileEntry);
   INIT_FUNC(RequestWifiServicePath);
+  INIT_FUNC(RequestHiddenWifiNetwork);
+  INIT_FUNC(RequestNetworkScan);
+  INIT_FUNC(RequestNetworkDeviceEnable);
 
   // Synaptics
   INIT_FUNC(SetSynapticsParameter);
 
   // Touchpad
   INIT_FUNC(SetTouchpadSensitivity);
   INIT_FUNC(SetTouchpadTapToClick);
 
   // Login
   INIT_FUNC(CheckWhitelist);
@@ skipping 112 matching lines @@
   INIT_FUNC(NotifyNetworkProxyResolved);
 
   return error_string.empty();
 }
 
 void SetLibcrosTimeHistogramFunction(LibcrosTimeHistogramFunc func) {
   addHistogram = func;
 }
 
 }  // namespace chromeos