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

Side by Side Diff: chrome/common/extensions/permissions/api_permission.h

Issue 16256023: Move systemInfo.memory API out of experimental namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved merge conflict from new commits Created 7 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium 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 CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 kVideoCapture, 126 kVideoCapture,
127 kWallpaperPrivate, 127 kWallpaperPrivate,
128 kWebNavigation, 128 kWebNavigation,
129 kWebRequest, 129 kWebRequest,
130 kWebRequestBlocking, 130 kWebRequestBlocking,
131 kWebRequestInternal, 131 kWebRequestInternal,
132 kWebSocketProxyPrivate, 132 kWebSocketProxyPrivate,
133 kWebstorePrivate, 133 kWebstorePrivate,
134 kWebView, 134 kWebView,
135 kSystemInfoCpu, 135 kSystemInfoCpu,
136 kSystemInfoMemory,
136 kEnumBoundary 137 kEnumBoundary
137 }; 138 };
138 139
139 struct CheckParam { 140 struct CheckParam {
140 }; 141 };
141 142
142 explicit APIPermission(const APIPermissionInfo* info); 143 explicit APIPermission(const APIPermissionInfo* info);
143 144
144 virtual ~APIPermission(); 145 virtual ~APIPermission();
145 146
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 const char* const name_; 290 const char* const name_;
290 const int flags_; 291 const int flags_;
291 const int l10n_message_id_; 292 const int l10n_message_id_;
292 const PermissionMessage::ID message_id_; 293 const PermissionMessage::ID message_id_;
293 const APIPermissionConstructor api_permission_constructor_; 294 const APIPermissionConstructor api_permission_constructor_;
294 }; 295 };
295 296
296 } // namespace extensions 297 } // namespace extensions
297 298
298 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 299 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698