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

Side by Side Diff: chromeos_cros_api.h

Issue 6606024: Eliminate ConenctionType, etc from chromeos_network.h (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cros.git@master
Patch Set: Rebase. Created 9 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 | Annotate | Revision Log
« 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) 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // and added new asynchronous getters. 180 // and added new asynchronous getters.
181 // 103: Deprecated GetCurrentKeyboardLayoutName. 181 // 103: Deprecated GetCurrentKeyboardLayoutName.
182 // 104: Deprecated DisconnectInputMethodStatus and 182 // 104: Deprecated DisconnectInputMethodStatus and
183 // InputMethodStatusConnectionIsAlive. 183 // InputMethodStatusConnectionIsAlive.
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
191 // to deprecated. Add RequestHiddenWifiNetwork, RequestNetworkScan,
192 // RequestNetworkDeviceEnable.
193
190 namespace chromeos { // NOLINT 194 namespace chromeos { // NOLINT
191 195
192 enum CrosAPIVersion { 196 enum CrosAPIVersion {
193 kCrosAPIMinVersion = 104, 197 kCrosAPIMinVersion = 104,
194 kCrosAPIVersion = 107 198 kCrosAPIVersion = 108
195 }; 199 };
196 200
197 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" 201 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so"
198 extern char const * const kCrosDefaultPath; 202 extern char const * const kCrosDefaultPath;
199 203
200 // |path_to_libcros| is the path to the libcros.so file. 204 // |path_to_libcros| is the path to the libcros.so file.
201 // Returns true to indicate success. 205 // Returns true to indicate success.
202 // If returns false, |load_error| will contain a string describing the 206 // If returns false, |load_error| will contain a string describing the
203 // problem. 207 // problem.
204 bool LoadLibcros(const char* path_to_libcros, std::string& load_error); 208 bool LoadLibcros(const char* path_to_libcros, std::string& load_error);
205 209
206 // Use to provide a function for passing histogram timing values to Chrome. 210 // Use to provide a function for passing histogram timing values to Chrome.
207 typedef void (*LibcrosTimeHistogramFunc)( 211 typedef void (*LibcrosTimeHistogramFunc)(
208 const char* name, const base::TimeDelta& delta); 212 const char* name, const base::TimeDelta& delta);
209 void SetLibcrosTimeHistogramFunction(LibcrosTimeHistogramFunc func); 213 void SetLibcrosTimeHistogramFunction(LibcrosTimeHistogramFunc func);
210 214
211 } // namespace chromeos 215 } // namespace chromeos
212 216
213 #endif /* CHROMEOS_CROS_API_VERSION_H_ */ 217 #endif /* CHROMEOS_CROS_API_VERSION_H_ */
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