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

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

Issue 520493002: Revert of Fix the Copresence permission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
8 #include "extensions/common/permissions/api_permission.h" 8 #include "extensions/common/permissions/api_permission.h"
9 #include "extensions/common/permissions/api_permission_set.h" 9 #include "extensions/common/permissions/api_permission_set.h"
10 #include "extensions/common/permissions/media_galleries_permission.h" 10 #include "extensions/common/permissions/media_galleries_permission.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS, PermissionMessage::kBookmarks}, 102 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS, PermissionMessage::kBookmarks},
103 {APIPermission::kBrailleDisplayPrivate, "brailleDisplayPrivate", 103 {APIPermission::kBrailleDisplayPrivate, "brailleDisplayPrivate",
104 APIPermissionInfo::kFlagCannotBeOptional}, 104 APIPermissionInfo::kFlagCannotBeOptional},
105 {APIPermission::kBrowsingData, "browsingData"}, 105 {APIPermission::kBrowsingData, "browsingData"},
106 {APIPermission::kContentSettings, "contentSettings", 106 {APIPermission::kContentSettings, "contentSettings",
107 APIPermissionInfo::kFlagNone, 107 APIPermissionInfo::kFlagNone,
108 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS, 108 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS,
109 PermissionMessage::kContentSettings}, 109 PermissionMessage::kContentSettings},
110 {APIPermission::kContextMenus, "contextMenus"}, 110 {APIPermission::kContextMenus, "contextMenus"},
111 {APIPermission::kCookie, "cookies"}, 111 {APIPermission::kCookie, "cookies"},
112 {APIPermission::kCopresence, "copresence", APIPermissionInfo::kFlagNone, 112 {APIPermission::kCopresence, "copresence",
113 IDS_EXTENSION_PROMPT_WARNING_COPRESENCE, PermissionMessage::kCopresence}, 113 IDS_EXTENSION_PROMPT_WARNING_COPRESENCE, PermissionMessage::kCopresence},
114 {APIPermission::kCopresencePrivate, "copresencePrivate"}, 114 {APIPermission::kCopresencePrivate, "copresencePrivate"},
115 {APIPermission::kEnterprisePlatformKeys, "enterprise.platformKeys"}, 115 {APIPermission::kEnterprisePlatformKeys, "enterprise.platformKeys"},
116 {APIPermission::kFileBrowserHandler, "fileBrowserHandler", 116 {APIPermission::kFileBrowserHandler, "fileBrowserHandler",
117 APIPermissionInfo::kFlagCannotBeOptional}, 117 APIPermissionInfo::kFlagCannotBeOptional},
118 {APIPermission::kFontSettings, "fontSettings", 118 {APIPermission::kFontSettings, "fontSettings",
119 APIPermissionInfo::kFlagCannotBeOptional}, 119 APIPermissionInfo::kFlagCannotBeOptional},
120 {APIPermission::kHistory, "history", APIPermissionInfo::kFlagNone, 120 {APIPermission::kHistory, "history", APIPermissionInfo::kFlagNone,
121 IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE, 121 IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE,
122 PermissionMessage::kBrowsingHistory}, 122 PermissionMessage::kBrowsingHistory},
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc", 376 PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc",
377 kOldOverrideEscFullscreenPermission)); 377 kOldOverrideEscFullscreenPermission));
378 aliases.push_back(PermissionsProvider::AliasInfo( 378 aliases.push_back(PermissionsProvider::AliasInfo(
379 "unlimitedStorage", kOldUnlimitedStoragePermission)); 379 "unlimitedStorage", kOldUnlimitedStoragePermission));
380 aliases.push_back(PermissionsProvider::AliasInfo( 380 aliases.push_back(PermissionsProvider::AliasInfo(
381 "tabs", kWindowsPermission)); 381 "tabs", kWindowsPermission));
382 return aliases; 382 return aliases;
383 } 383 }
384 384
385 } // namespace extensions 385 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698