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 #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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 // DeactivateImeProperty | 75 // DeactivateImeProperty |
76 // 20: Removed depreceted methods above. | 76 // 20: Removed depreceted methods above. |
77 // 21: Removed loading of a deprecated method: SetInputMethodActivated | 77 // 21: Removed loading of a deprecated method: SetInputMethodActivated |
78 // 22: Added ChromeOSConnectToNetworkWithCertInfo. | 78 // 22: Added ChromeOSConnectToNetworkWithCertInfo. |
79 // 23: Added profile entries and SetAutoConnect and DeleteRememberedService. | 79 // 23: Added profile entries and SetAutoConnect and DeleteRememberedService. |
80 // 24: Added MonitorInputMethodUiStatus and DisconnectInputMethodUiStatus. | 80 // 24: Added MonitorInputMethodUiStatus and DisconnectInputMethodUiStatus. |
81 // 25: Removed the depreceted method above. | 81 // 25: Removed the depreceted method above. |
82 // Added MonitorInputMethodStatus, DisconnectInputMethodStatusConnection, | 82 // Added MonitorInputMethodStatus, DisconnectInputMethodStatusConnection, |
83 // InputMethodStatusConnectionIsAlive. | 83 // InputMethodStatusConnectionIsAlive. |
84 // 26: Added speech synthesis library functions. | 84 // 26: Added speech synthesis library functions. |
| 85 // 27: Added DisconnectFromNetwork and SetPassphrase |
85 | 86 |
86 namespace chromeos { // NOLINT | 87 namespace chromeos { // NOLINT |
87 | 88 |
88 enum CrosAPIVersion { | 89 enum CrosAPIVersion { |
89 kCrosAPIMinVersion = 21, | 90 kCrosAPIMinVersion = 21, |
90 kCrosAPIVersion = 26 | 91 kCrosAPIVersion = 27 |
91 }; | 92 }; |
92 | 93 |
93 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" | 94 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" |
94 extern char const * const kCrosDefaultPath; | 95 extern char const * const kCrosDefaultPath; |
95 | 96 |
96 // |path_to_libcros| is the path to the libcros.so file. | 97 // |path_to_libcros| is the path to the libcros.so file. |
97 // Returns true to indicate success. | 98 // Returns true to indicate success. |
98 // If returns false, |load_error| will contain a string describing the | 99 // If returns false, |load_error| will contain a string describing the |
99 // problem. | 100 // problem. |
100 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); | 101 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); |
101 | 102 |
102 } // namespace chromeos | 103 } // namespace chromeos |
103 | 104 |
104 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ | 105 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ |
OLD | NEW |