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

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

Issue 11620011: Issue 11428116 had to be reverted as it broke build due to a unused variable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed formatting Created 8 years 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 #include "chrome/common/extensions/permissions/api_permission.h" 5 #include "chrome/common/extensions/permissions/api_permission.h"
6 6
7 #include "chrome/common/extensions/permissions/bluetooth_device_permission.h" 7 #include "chrome/common/extensions/permissions/bluetooth_device_permission.h"
8 #include "chrome/common/extensions/permissions/permissions_info.h" 8 #include "chrome/common/extensions/permissions/permissions_info.h"
9 #include "chrome/common/extensions/permissions/socket_permission.h" 9 #include "chrome/common/extensions/permissions/socket_permission.h"
10 #include "chrome/common/extensions/permissions/usb_device_permission.h" 10 #include "chrome/common/extensions/permissions/usb_device_permission.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 { APIPermission::kWebRequestBlocking, "webRequestBlocking" }, 238 { APIPermission::kWebRequestBlocking, "webRequestBlocking" },
239 { APIPermission::kWebView, "webview", kFlagCannotBeOptional }, 239 { APIPermission::kWebView, "webview", kFlagCannotBeOptional },
240 240
241 // Register private permissions. 241 // Register private permissions.
242 { APIPermission::kAutoTestPrivate, "autotestPrivate", 242 { APIPermission::kAutoTestPrivate, "autotestPrivate",
243 kFlagCannotBeOptional }, 243 kFlagCannotBeOptional },
244 { APIPermission::kBookmarkManagerPrivate, "bookmarkManagerPrivate", 244 { APIPermission::kBookmarkManagerPrivate, "bookmarkManagerPrivate",
245 kFlagCannotBeOptional }, 245 kFlagCannotBeOptional },
246 { APIPermission::kChromeosInfoPrivate, "chromeosInfoPrivate", 246 { APIPermission::kChromeosInfoPrivate, "chromeosInfoPrivate",
247 kFlagCannotBeOptional }, 247 kFlagCannotBeOptional },
248 { APIPermission::kDeveloperPrivate, "developerPrivate",
249 kFlagCannotBeOptional },
248 { APIPermission::kDial, "dial", kFlagCannotBeOptional }, 250 { APIPermission::kDial, "dial", kFlagCannotBeOptional },
249 { APIPermission::kFileBrowserHandlerInternal, "fileBrowserHandlerInternal", 251 { APIPermission::kFileBrowserHandlerInternal, "fileBrowserHandlerInternal",
250 kFlagCannotBeOptional }, 252 kFlagCannotBeOptional },
251 { APIPermission::kFileBrowserPrivate, "fileBrowserPrivate", 253 { APIPermission::kFileBrowserPrivate, "fileBrowserPrivate",
252 kFlagCannotBeOptional }, 254 kFlagCannotBeOptional },
253 { APIPermission::kManagedModePrivate, "managedModePrivate", 255 { APIPermission::kManagedModePrivate, "managedModePrivate",
254 kFlagCannotBeOptional }, 256 kFlagCannotBeOptional },
255 { APIPermission::kMediaPlayerPrivate, "mediaPlayerPrivate", 257 { APIPermission::kMediaPlayerPrivate, "mediaPlayerPrivate",
256 kFlagCannotBeOptional }, 258 kFlagCannotBeOptional },
257 { APIPermission::kMetricsPrivate, "metricsPrivate", 259 { APIPermission::kMetricsPrivate, "metricsPrivate",
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 pr.flags, 357 pr.flags,
356 pr.constructor); 358 pr.constructor);
357 } 359 }
358 360
359 // Register aliases. 361 // Register aliases.
360 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission); 362 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
361 info->RegisterAlias("tabs", kWindowsPermission); 363 info->RegisterAlias("tabs", kWindowsPermission);
362 } 364 }
363 365
364 } // namespace extensions 366 } // 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