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

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

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. 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 | Annotate | Revision Log
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 PermissionMessage::kDownloads }, 183 PermissionMessage::kDownloads },
184 { APIPermission::kExperimental, "experimental", kFlagCannotBeOptional }, 184 { APIPermission::kExperimental, "experimental", kFlagCannotBeOptional },
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 hosted and packaged app permissions.
194 { APIPermission::kAppNotifications, "appNotifications" },
195
196 // Register extension permissions. 193 // Register extension permissions.
197 { APIPermission::kActiveTab, "activeTab" }, 194 { APIPermission::kActiveTab, "activeTab" },
198 { APIPermission::kAlarms, "alarms" }, 195 { APIPermission::kAlarms, "alarms" },
199 { APIPermission::kBookmark, "bookmarks", kFlagNone, 196 { APIPermission::kBookmark, "bookmarks", kFlagNone,
200 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS, 197 IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,
201 PermissionMessage::kBookmarks }, 198 PermissionMessage::kBookmarks },
202 { APIPermission::kBrowsingData, "browsingData" }, 199 { APIPermission::kBrowsingData, "browsingData" },
203 { APIPermission::kContentSettings, "contentSettings", kFlagNone, 200 { APIPermission::kContentSettings, "contentSettings", kFlagNone,
204 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS, 201 IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS,
205 PermissionMessage::kContentSettings }, 202 PermissionMessage::kContentSettings },
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 pr.flags, 366 pr.flags,
370 pr.constructor); 367 pr.constructor);
371 } 368 }
372 369
373 // Register aliases. 370 // Register aliases.
374 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission); 371 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
375 info->RegisterAlias("tabs", kWindowsPermission); 372 info->RegisterAlias("tabs", kWindowsPermission);
376 } 373 }
377 374
378 } // namespace extensions 375 } // 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