OLD | NEW |
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/browser/extensions/api/permissions/permissions_api.h" | 5 #include "chrome/browser/extensions/api/permissions/permissions_api.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" | 9 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" |
10 #include "chrome/browser/extensions/permissions_updater.h" | 10 #include "chrome/browser/extensions/permissions_updater.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/common/extensions/api/permissions.h" | 12 #include "chrome/common/extensions/api/permissions.h" |
13 #include "extensions/browser/extension_prefs.h" | 13 #include "extensions/browser/extension_prefs.h" |
14 #include "extensions/common/error_utils.h" | 14 #include "extensions/common/error_utils.h" |
15 #include "extensions/common/extension.h" | 15 #include "extensions/common/extension.h" |
16 #include "extensions/common/manifest_handlers/permissions_parser.h" | 16 #include "extensions/common/manifest_handlers/permissions_parser.h" |
17 #include "extensions/common/permissions/permission_message_provider.h" | 17 #include "extensions/common/permissions/permission_message_provider.h" |
| 18 #include "extensions/common/permissions/permissions_data.h" |
18 #include "extensions/common/permissions/permissions_info.h" | 19 #include "extensions/common/permissions/permissions_info.h" |
19 | 20 |
20 namespace extensions { | 21 namespace extensions { |
21 | 22 |
22 using api::permissions::Permissions; | 23 using api::permissions::Permissions; |
23 | 24 |
24 namespace Contains = api::permissions::Contains; | 25 namespace Contains = api::permissions::Contains; |
25 namespace GetAll = api::permissions::GetAll; | 26 namespace GetAll = api::permissions::GetAll; |
26 namespace Remove = api::permissions::Remove; | 27 namespace Remove = api::permissions::Remove; |
27 namespace Request = api::permissions::Request; | 28 namespace Request = api::permissions::Request; |
(...skipping 25 matching lines...) Expand all Loading... |
53 EXTENSION_FUNCTION_VALIDATE(params); | 54 EXTENSION_FUNCTION_VALIDATE(params); |
54 | 55 |
55 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( | 56 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( |
56 params->permissions, | 57 params->permissions, |
57 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), | 58 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), |
58 &error_); | 59 &error_); |
59 if (!permissions.get()) | 60 if (!permissions.get()) |
60 return false; | 61 return false; |
61 | 62 |
62 results_ = Contains::Results::Create( | 63 results_ = Contains::Results::Create( |
63 GetExtension()->GetActivePermissions()->Contains(*permissions.get())); | 64 GetExtension()->permissions_data()->active_permissions()->Contains( |
| 65 *permissions.get())); |
64 return true; | 66 return true; |
65 } | 67 } |
66 | 68 |
67 bool PermissionsGetAllFunction::RunSync() { | 69 bool PermissionsGetAllFunction::RunSync() { |
68 scoped_ptr<Permissions> permissions = | 70 scoped_ptr<Permissions> permissions = helpers::PackPermissionSet( |
69 helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); | 71 GetExtension()->permissions_data()->active_permissions().get()); |
70 results_ = GetAll::Results::Create(*permissions); | 72 results_ = GetAll::Results::Create(*permissions); |
71 return true; | 73 return true; |
72 } | 74 } |
73 | 75 |
74 bool PermissionsRemoveFunction::RunSync() { | 76 bool PermissionsRemoveFunction::RunSync() { |
75 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); | 77 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); |
76 EXTENSION_FUNCTION_VALIDATE(params); | 78 EXTENSION_FUNCTION_VALIDATE(params); |
77 | 79 |
78 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( | 80 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( |
79 params->permissions, | 81 params->permissions, |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); | 216 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); |
215 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); | 217 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); |
216 install_ui_->ConfirmPermissions( | 218 install_ui_->ConfirmPermissions( |
217 this, GetExtension(), requested_permissions_.get()); | 219 this, GetExtension(), requested_permissions_.get()); |
218 } | 220 } |
219 | 221 |
220 return true; | 222 return true; |
221 } | 223 } |
222 | 224 |
223 } // namespace extensions | 225 } // namespace extensions |
OLD | NEW |