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

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

Issue 12463015: Enable <adview> tag for packaged apps. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Merge fix. Created 7 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
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/media_galleries_permission.h" 8 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
9 #include "chrome/common/extensions/permissions/permissions_info.h" 9 #include "chrome/common/extensions/permissions/permissions_info.h"
10 #include "chrome/common/extensions/permissions/socket_permission.h" 10 #include "chrome/common/extensions/permissions/socket_permission.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 { APIPermission::kGeolocation, "geolocation", kFlagCannotBeOptional, 185 { APIPermission::kGeolocation, "geolocation", kFlagCannotBeOptional,
186 IDS_EXTENSION_PROMPT_WARNING_GEOLOCATION, 186 IDS_EXTENSION_PROMPT_WARNING_GEOLOCATION,
187 PermissionMessage::kGeolocation }, 187 PermissionMessage::kGeolocation },
188 { APIPermission::kNotification, "notifications" }, 188 { APIPermission::kNotification, "notifications" },
189 { APIPermission::kScreensaver, "screensaver" }, 189 { APIPermission::kScreensaver, "screensaver" },
190 { APIPermission::kUnlimitedStorage, "unlimitedStorage", 190 { APIPermission::kUnlimitedStorage, "unlimitedStorage",
191 kFlagCannotBeOptional }, 191 kFlagCannotBeOptional },
192 192
193 // Register extension permissions. 193 // Register extension permissions.
194 { APIPermission::kActiveTab, "activeTab" }, 194 { APIPermission::kActiveTab, "activeTab" },
195 { APIPermission::kAdView, "adview" },
195 { APIPermission::kAlarms, "alarms" }, 196 { APIPermission::kAlarms, "alarms" },
196 { APIPermission::kBookmark, "bookmarks", kFlagNone, 197 { APIPermission::kBookmark, "bookmarks", kFlagNone,
197 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS, 198 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,
198 PermissionMessage::kBookmarks }, 199 PermissionMessage::kBookmarks },
199 { APIPermission::kBrowsingData, "browsingData" }, 200 { APIPermission::kBrowsingData, "browsingData" },
200 { APIPermission::kContentSettings, "contentSettings", kFlagNone, 201 { APIPermission::kContentSettings, "contentSettings", kFlagNone,
201 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS, 202 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS,
202 PermissionMessage::kContentSettings }, 203 PermissionMessage::kContentSettings },
203 { APIPermission::kContextMenus, "contextMenus" }, 204 { APIPermission::kContextMenus, "contextMenus" },
204 { APIPermission::kCookie, "cookies" }, 205 { APIPermission::kCookie, "cookies" },
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 pr.flags, 369 pr.flags,
369 pr.constructor); 370 pr.constructor);
370 } 371 }
371 372
372 // Register aliases. 373 // Register aliases.
373 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission); 374 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
374 info->RegisterAlias("tabs", kWindowsPermission); 375 info->RegisterAlias("tabs", kWindowsPermission);
375 } 376 }
376 377
377 } // namespace extensions 378 } // 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