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

Side by Side Diff: chrome/common/extensions/extension.cc

Issue 10878040: Move context-sensitive app.window.* functions to app.window.current().* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 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 | 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/extension.h" 5 #include "chrome/common/extensions/extension.h"
6 6
7 #include <ostream> 7 #include <ostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 3116 matching lines...) Expand 10 before | Expand all | Expand 10 after
3127 error, 3127 error,
3128 &api_permissions, 3128 &api_permissions,
3129 &host_permissions)) { 3129 &host_permissions)) {
3130 return false; 3130 return false;
3131 } 3131 }
3132 3132
3133 // TODO(jeremya/kalman) do this via the features system by exposing the 3133 // TODO(jeremya/kalman) do this via the features system by exposing the
3134 // app.window API to platform apps, with no dependency on any permissions. 3134 // app.window API to platform apps, with no dependency on any permissions.
3135 // See http://crbug.com/120069. 3135 // See http://crbug.com/120069.
3136 if (is_platform_app()) { 3136 if (is_platform_app()) {
3137 api_permissions.insert(APIPermission::kAppCurrentWindowInternal);
3137 api_permissions.insert(APIPermission::kAppRuntime); 3138 api_permissions.insert(APIPermission::kAppRuntime);
3138 api_permissions.insert(APIPermission::kAppWindow); 3139 api_permissions.insert(APIPermission::kAppWindow);
3139 } 3140 }
3140 3141
3141 if (from_webstore()) { 3142 if (from_webstore()) {
3142 details_url_ = 3143 details_url_ =
3143 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + id()); 3144 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + id());
3144 } 3145 }
3145 3146
3146 APIPermissionSet optional_api_permissions; 3147 APIPermissionSet optional_api_permissions;
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
3948 3949
3949 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( 3950 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
3950 const Extension* extension, 3951 const Extension* extension,
3951 const PermissionSet* permissions, 3952 const PermissionSet* permissions,
3952 Reason reason) 3953 Reason reason)
3953 : reason(reason), 3954 : reason(reason),
3954 extension(extension), 3955 extension(extension),
3955 permissions(permissions) {} 3956 permissions(permissions) {}
3956 3957
3957 } // namespace extensions 3958 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698