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

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

Issue 10852016: Move serial out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve merge conflicts. 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 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "chrome/common/extensions/permissions/permission_message.h" 10 #include "chrome/common/extensions/permissions/permission_message.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 kMediaGalleries, 63 kMediaGalleries,
64 kMediaGalleriesAllGalleries, 64 kMediaGalleriesAllGalleries,
65 kMediaGalleriesRead, 65 kMediaGalleriesRead,
66 kMediaPlayerPrivate, 66 kMediaPlayerPrivate,
67 kMetricsPrivate, 67 kMetricsPrivate,
68 kNotification, 68 kNotification,
69 kPageCapture, 69 kPageCapture,
70 kPlugin, 70 kPlugin,
71 kPrivacy, 71 kPrivacy,
72 kProxy, 72 kProxy,
73 kSerial,
73 kSocket, 74 kSocket,
74 kStorage, 75 kStorage,
75 kSystemPrivate, 76 kSystemPrivate,
76 kTab, 77 kTab,
77 kTerminalPrivate, 78 kTerminalPrivate,
78 kTopSites, 79 kTopSites,
79 kTts, 80 kTts,
80 kTtsEngine, 81 kTtsEngine,
81 kUnlimitedStorage, 82 kUnlimitedStorage,
82 kUsb,
83 kVideoCapture, 83 kVideoCapture,
84 kWallpaperPrivate, 84 kWallpaperPrivate,
85 kWebNavigation, 85 kWebNavigation,
86 kWebRequest, 86 kWebRequest,
87 kWebRequestBlocking, 87 kWebRequestBlocking,
88 kWebRequestInternal, 88 kWebRequestInternal,
89 kWebSocketProxyPrivate, 89 kWebSocketProxyPrivate,
90 kWebstorePrivate, 90 kWebstorePrivate,
91 kEnumBoundary 91 kEnumBoundary
92 }; 92 };
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 int flags_; 159 int flags_;
160 int l10n_message_id_; 160 int l10n_message_id_;
161 PermissionMessage::ID message_id_; 161 PermissionMessage::ID message_id_;
162 }; 162 };
163 163
164 typedef std::set<APIPermission::ID> APIPermissionSet; 164 typedef std::set<APIPermission::ID> APIPermissionSet;
165 165
166 } // namespace extensions 166 } // namespace extensions
167 167
168 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ 168 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_
OLDNEW
« no previous file with comments | « chrome/common/extensions/docs/samples.json ('k') | chrome/common/extensions/permissions/api_permission.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698