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

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

Issue 10834261: Move chrome.experimental.app.onLaunched event handler to chrome.app.runtime.onLaunched. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another merge before retrying commit. Created 8 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 | 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/permissions_info.h" 7 #include "chrome/common/extensions/permissions/permissions_info.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 kFlagImpliesFullURLAccess | kFlagCannotBeOptional }, 149 kFlagImpliesFullURLAccess | kFlagCannotBeOptional },
150 { kPlugin, "plugin", 150 { kPlugin, "plugin",
151 kFlagImpliesFullURLAccess | kFlagImpliesFullAccess | 151 kFlagImpliesFullURLAccess | kFlagImpliesFullAccess |
152 kFlagCannotBeOptional, 152 kFlagCannotBeOptional,
153 IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS, 153 IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS,
154 PermissionMessage::kFullAccess }, 154 PermissionMessage::kFullAccess },
155 155
156 // Platform-app permissions. 156 // Platform-app permissions.
157 { kSerial, "serial", kFlagCannotBeOptional }, 157 { kSerial, "serial", kFlagCannotBeOptional },
158 { kSocket, "socket", kFlagCannotBeOptional }, 158 { kSocket, "socket", kFlagCannotBeOptional },
159 { kAppRuntime, "app.runtime" },
159 { kAppWindow, "app.window" }, 160 { kAppWindow, "app.window" },
160 { kAudioCapture, "audioCapture", kFlagNone, 161 { kAudioCapture, "audioCapture", kFlagNone,
161 IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE, 162 IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
162 PermissionMessage::kAudioCapture }, 163 PermissionMessage::kAudioCapture },
163 { kVideoCapture, "videoCapture", kFlagNone, 164 { kVideoCapture, "videoCapture", kFlagNone,
164 IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE, 165 IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
165 PermissionMessage::kVideoCapture }, 166 PermissionMessage::kVideoCapture },
166 // "fileSystem" has no permission string because read-only access is only 167 // "fileSystem" has no permission string because read-only access is only
167 // granted after the user has been shown a file chooser dialog and selected 168 // granted after the user has been shown a file chooser dialog and selected
168 // a file. Selecting the file is considered consent to read it. 169 // a file. Selecting the file is considered consent to read it.
(...skipping 17 matching lines...) Expand all
186 187
187 // Register aliases. 188 // Register aliases.
188 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission); 189 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
189 info->RegisterAlias("tabs", kWindowsPermission); 190 info->RegisterAlias("tabs", kWindowsPermission);
190 // TODO(mihaip): Should be removed for the M20 branch, see 191 // TODO(mihaip): Should be removed for the M20 branch, see
191 // http://crbug.com/120447 for more details. 192 // http://crbug.com/120447 for more details.
192 info->RegisterAlias("background", kTemporaryBackgroundAlias); 193 info->RegisterAlias("background", kTemporaryBackgroundAlias);
193 } 194 }
194 195
195 } // namespace extensions 196 } // 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