| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "base/time.h" | 9 #include "base/time.h" |
| 10 | 10 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 // 105: Introduce SetLibcrosHistogramFunction. | 184 // 105: Introduce SetLibcrosHistogramFunction. |
| 185 // 106: Removed GetActiveInputMethods, SetActiveInputMethods, | 185 // 106: Removed GetActiveInputMethods, SetActiveInputMethods, |
| 186 // GetSupportedInputMethods, SetInputMethodActivated, GetImeConfig, | 186 // GetSupportedInputMethods, SetInputMethodActivated, GetImeConfig, |
| 187 // GetHardwareKeyboardLayoutName, GetCurrentKeyboardLayoutName, | 187 // GetHardwareKeyboardLayoutName, GetCurrentKeyboardLayoutName, |
| 188 // DisconnectInputMethodStatus, and InputMethodStatusConnectionIsAlive. | 188 // DisconnectInputMethodStatus, and InputMethodStatusConnectionIsAlive. |
| 189 // 107: Added RequestNetworkServiceConnect and SetNetworkServiceProperty. | 189 // 107: Added RequestNetworkServiceConnect and SetNetworkServiceProperty. |
| 190 // 108: Move types, RequestWifiServicePath, RequestScan, EnableNetworkDevice | 190 // 108: Move types, RequestWifiServicePath, RequestScan, EnableNetworkDevice |
| 191 // to deprecated. Add RequestHiddenWifiNetwork, RequestNetworkScan, | 191 // to deprecated. Add RequestHiddenWifiNetwork, RequestNetworkScan, |
| 192 // RequestNetworkDeviceEnable. | 192 // RequestNetworkDeviceEnable. |
| 193 // 109: Added CryptohomeDoAutomaticFreeDiskSpaceControl and | 193 // 109: Added CryptohomeDoAutomaticFreeDiskSpaceControl and |
| 194 // CryptohomeAsyncDoAutomaticFreeDiskSpaceControl | 194 // CryptohomeAsyncDoAutomaticFreeDiskSpaceControl. |
| 195 // 110: Deprecated GetCurrentInputMethod | 195 // 110: Deprecated GetCurrentInputMethod. |
| 196 // 111: Added async RequestUpdateCheck. |
| 196 | 197 |
| 197 namespace chromeos { // NOLINT | 198 namespace chromeos { // NOLINT |
| 198 | 199 |
| 199 enum CrosAPIVersion { | 200 enum CrosAPIVersion { |
| 200 kCrosAPIMinVersion = 104, | 201 kCrosAPIMinVersion = 104, |
| 201 kCrosAPIVersion = 110 | 202 kCrosAPIVersion = 111 |
| 202 }; | 203 }; |
| 203 | 204 |
| 204 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" | 205 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" |
| 205 extern char const * const kCrosDefaultPath; | 206 extern char const * const kCrosDefaultPath; |
| 206 | 207 |
| 207 // |path_to_libcros| is the path to the libcros.so file. | 208 // |path_to_libcros| is the path to the libcros.so file. |
| 208 // Returns true to indicate success. | 209 // Returns true to indicate success. |
| 209 // If returns false, |load_error| will contain a string describing the | 210 // If returns false, |load_error| will contain a string describing the |
| 210 // problem. | 211 // problem. |
| 211 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); | 212 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); |
| 212 | 213 |
| 213 // Use to provide a function for passing histogram timing values to Chrome. | 214 // Use to provide a function for passing histogram timing values to Chrome. |
| 214 typedef void (*LibcrosTimeHistogramFunc)( | 215 typedef void (*LibcrosTimeHistogramFunc)( |
| 215 const char* name, const base::TimeDelta& delta); | 216 const char* name, const base::TimeDelta& delta); |
| 216 void SetLibcrosTimeHistogramFunction(LibcrosTimeHistogramFunc func); | 217 void SetLibcrosTimeHistogramFunction(LibcrosTimeHistogramFunc func); |
| 217 | 218 |
| 218 } // namespace chromeos | 219 } // namespace chromeos |
| 219 | 220 |
| 220 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ | 221 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ |
| OLD | NEW |