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

Side by Side Diff: chromeos_cros_api.h

Issue 652187: Added ConnectToNetwork (Closed)
Patch Set: merge in new changes Created 10 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
« no previous file with comments | « no previous file | chromeos_network.h » ('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) 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 #ifndef CHROMEOS_CROS_API_VERSION_H_ 5 #ifndef CHROMEOS_CROS_API_VERSION_H_
6 #define CHROMEOS_CROS_API_VERSION_H_ 6 #define CHROMEOS_CROS_API_VERSION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 // This file defines two version numbers for the CrosAPI. 10 // This file defines two version numbers for the CrosAPI.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // 0: Version number prior to the version scheme. 47 // 0: Version number prior to the version scheme.
48 // 1: Added CrosVersionCheck API. 48 // 1: Added CrosVersionCheck API.
49 // Changed load to take file path instead of so handle. 49 // Changed load to take file path instead of so handle.
50 // 2: Changed the interface for network monitoring callbacks. 50 // 2: Changed the interface for network monitoring callbacks.
51 // 3: Added support disconnecting the network monitor. 51 // 3: Added support disconnecting the network monitor.
52 // 4: Added Update API 52 // 4: Added Update API
53 // 5: Added IPConfig code 53 // 5: Added IPConfig code
54 // 6: Deprecated GetIPConfigProperty and SetIPConfigProperty. 54 // 6: Deprecated GetIPConfigProperty and SetIPConfigProperty.
55 // 7: Added a member to InputLanguageList struct (backward incompatible). 55 // 7: Added a member to InputLanguageList struct (backward incompatible).
56 // 8: Added LanguageStatusConnectionIsAlive API. 56 // 8: Added LanguageStatusConnectionIsAlive API.
57 // 9: Added ConnectToNetwork and refactored code (backward incompatible).
57 58
58 namespace chromeos { // NOLINT 59 namespace chromeos { // NOLINT
59 60
60 enum CrosAPIVersion { 61 enum CrosAPIVersion {
61 kCrosAPIMinVersion = 7, 62 kCrosAPIMinVersion = 9,
62 kCrosAPIVersion = 8 63 kCrosAPIVersion = 9
63 }; 64 };
64 65
65 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" 66 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so"
66 extern char const * const kCrosDefaultPath; 67 extern char const * const kCrosDefaultPath;
67 68
68 // TODO(davemoore) Vestigial API. Remove when Chrome is calling the new API. 69 // TODO(davemoore) Vestigial API. Remove when Chrome is calling the new API.
69 bool LoadCros(const char* path_to_libcros); 70 bool LoadCros(const char* path_to_libcros);
70 71
71 // |path_to_libcros| is the path to the libcros.so file. 72 // |path_to_libcros| is the path to the libcros.so file.
72 // Returns true to indicate success. 73 // Returns true to indicate success.
73 // If returns false, |load_error| will contain a string describing the 74 // If returns false, |load_error| will contain a string describing the
74 // problem. 75 // problem.
75 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); 76 bool LoadLibcros(const char* path_to_libcros, std::string& load_error);
76 77
77 } // namespace chromeos 78 } // namespace chromeos
78 79
79 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ 80 #endif /* CHROMEOS_CROS_API_VERSION_H_ */
80 81
OLDNEW
« no previous file with comments | « no previous file | chromeos_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698