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

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

Issue 18578008: [SystemInfo API] Move Storage API out of experimental namespace and rename to the "system" namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix PermissionTest unittest. Created 7 years, 4 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_permission.h" 9 #include "chrome/common/extensions/permissions/bluetooth_permission.h"
10 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 10 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 { APIPermission::kUsbDevice, "usbDevices", 282 { APIPermission::kUsbDevice, "usbDevices",
283 APIPermissionInfo::kFlagNone, 0, PermissionMessage::kNone, 283 APIPermissionInfo::kFlagNone, 0, PermissionMessage::kNone,
284 &CreateAPIPermission<UsbDevicePermission> }, 284 &CreateAPIPermission<UsbDevicePermission> },
285 { APIPermission::kSystemIndicator, "systemIndicator", 285 { APIPermission::kSystemIndicator, "systemIndicator",
286 APIPermissionInfo::kFlagNone, 286 APIPermissionInfo::kFlagNone,
287 IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR, 287 IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,
288 PermissionMessage::kSystemIndicator }, 288 PermissionMessage::kSystemIndicator },
289 { APIPermission::kSystemCpu, "system.cpu" }, 289 { APIPermission::kSystemCpu, "system.cpu" },
290 { APIPermission::kSystemMemory, "system.memory" }, 290 { APIPermission::kSystemMemory, "system.memory" },
291 { APIPermission::kSystemDisplay, "system.display" }, 291 { APIPermission::kSystemDisplay, "system.display" },
292 { APIPermission::kSystemStorage, "system.storage" },
292 { APIPermission::kPointerLock, "pointerLock" }, 293 { APIPermission::kPointerLock, "pointerLock" },
293 { APIPermission::kFullscreen, "fullscreen" }, 294 { APIPermission::kFullscreen, "fullscreen" },
294 { APIPermission::kAudio, "audio" }, 295 { APIPermission::kAudio, "audio" },
295 }; 296 };
296 297
297 std::vector<APIPermissionInfo*> permissions; 298 std::vector<APIPermissionInfo*> permissions;
298 299
299 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) { 300 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) {
300 const PermissionRegistration& pr = PermissionsToRegister[i]; 301 const PermissionRegistration& pr = PermissionsToRegister[i];
301 permissions.push_back(new APIPermissionInfo( 302 permissions.push_back(new APIPermissionInfo(
(...skipping 10 matching lines...) Expand all
312 // Register aliases. 313 // Register aliases.
313 std::vector<PermissionsInfo::AliasInfo> aliases; 314 std::vector<PermissionsInfo::AliasInfo> aliases;
314 aliases.push_back(PermissionsInfo::AliasInfo( 315 aliases.push_back(PermissionsInfo::AliasInfo(
315 "unlimitedStorage", kOldUnlimitedStoragePermission)); 316 "unlimitedStorage", kOldUnlimitedStoragePermission));
316 aliases.push_back(PermissionsInfo::AliasInfo( 317 aliases.push_back(PermissionsInfo::AliasInfo(
317 "tabs", kWindowsPermission)); 318 "tabs", kWindowsPermission));
318 return aliases; 319 return aliases;
319 } 320 }
320 321
321 } // namespace extensions 322 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698