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

Side by Side Diff: chrome/common/extensions/permissions/chrome_api_permissions.cc

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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "chrome/common/extensions/permissions/chrome_api_permissions.h" 5 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
6 6
7 #include "chrome/common/extensions/permissions/api_permission.h" 7 #include "chrome/common/extensions/permissions/api_permission.h"
8 #include "chrome/common/extensions/permissions/api_permission_set.h" 8 #include "chrome/common/extensions/permissions/api_permission_set.h"
9 #include "chrome/common/extensions/permissions/bluetooth_device_permission.h" 9 #include "chrome/common/extensions/permissions/bluetooth_device_permission.h"
10 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 10 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 IDS_EXTENSION_PROMPT_WARNING_USB, 261 IDS_EXTENSION_PROMPT_WARNING_USB,
262 PermissionMessage::kUsb }, 262 PermissionMessage::kUsb },
263 { APIPermission::kUsbDevice, "usbDevices", 263 { APIPermission::kUsbDevice, "usbDevices",
264 APIPermissionInfo::kFlagNone, 0, PermissionMessage::kNone, 264 APIPermissionInfo::kFlagNone, 0, PermissionMessage::kNone,
265 &CreateAPIPermission<UsbDevicePermission> }, 265 &CreateAPIPermission<UsbDevicePermission> },
266 { APIPermission::kSystemIndicator, "systemIndicator", 266 { APIPermission::kSystemIndicator, "systemIndicator",
267 APIPermissionInfo::kFlagNone, 267 APIPermissionInfo::kFlagNone,
268 IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR, 268 IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,
269 PermissionMessage::kSystemIndicator }, 269 PermissionMessage::kSystemIndicator },
270 { APIPermission::kSystemInfoCpu, "systemInfo.cpu" }, 270 { APIPermission::kSystemInfoCpu, "systemInfo.cpu" },
271 { APIPermission::kSystemInfoMemory, "systemInfo.memory" },
271 { APIPermission::kSystemInfoDisplay, "systemInfo.display" }, 272 { APIPermission::kSystemInfoDisplay, "systemInfo.display" },
272 { APIPermission::kPointerLock, "pointerLock" }, 273 { APIPermission::kPointerLock, "pointerLock" },
273 { APIPermission::kFullscreen, "fullscreen" }, 274 { APIPermission::kFullscreen, "fullscreen" },
274 { APIPermission::kAudio, "audio" }, 275 { APIPermission::kAudio, "audio" },
275 }; 276 };
276 277
277 std::vector<APIPermissionInfo*> permissions; 278 std::vector<APIPermissionInfo*> permissions;
278 279
279 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) { 280 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) {
280 const PermissionRegistration& pr = PermissionsToRegister[i]; 281 const PermissionRegistration& pr = PermissionsToRegister[i];
(...skipping 11 matching lines...) Expand all
292 // Register aliases. 293 // Register aliases.
293 std::vector<PermissionsInfo::AliasInfo> aliases; 294 std::vector<PermissionsInfo::AliasInfo> aliases;
294 aliases.push_back(PermissionsInfo::AliasInfo( 295 aliases.push_back(PermissionsInfo::AliasInfo(
295 "unlimitedStorage", kOldUnlimitedStoragePermission)); 296 "unlimitedStorage", kOldUnlimitedStoragePermission));
296 aliases.push_back(PermissionsInfo::AliasInfo( 297 aliases.push_back(PermissionsInfo::AliasInfo(
297 "tabs", kWindowsPermission)); 298 "tabs", kWindowsPermission));
298 return aliases; 299 return aliases;
299 } 300 }
300 301
301 } // namespace extensions 302 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698