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/extensions/api/permissions/permissions_api_helpers.h" | 8 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" |
9 #include "chrome/browser/extensions/extension_prefs.h" | 9 #include "chrome/browser/extensions/extension_prefs.h" |
10 #include "chrome/browser/extensions/permissions_updater.h" | 10 #include "chrome/browser/extensions/permissions_updater.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 if (!permissions.get()) | 61 if (!permissions.get()) |
62 return false; | 62 return false; |
63 | 63 |
64 results_ = Contains::Results::Create( | 64 results_ = Contains::Results::Create( |
65 GetExtension()->GetActivePermissions()->Contains(*permissions.get())); | 65 GetExtension()->GetActivePermissions()->Contains(*permissions.get())); |
66 return true; | 66 return true; |
67 } | 67 } |
68 | 68 |
69 bool PermissionsGetAllFunction::RunImpl() { | 69 bool PermissionsGetAllFunction::RunImpl() { |
70 scoped_ptr<Permissions> permissions = | 70 scoped_ptr<Permissions> permissions = |
71 helpers::PackPermissionSet(GetExtension()->GetActivePermissions()); | 71 helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); |
72 results_ = GetAll::Results::Create(*permissions); | 72 results_ = GetAll::Results::Create(*permissions); |
73 return true; | 73 return true; |
74 } | 74 } |
75 | 75 |
76 bool PermissionsRemoveFunction::RunImpl() { | 76 bool PermissionsRemoveFunction::RunImpl() { |
77 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); | 77 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); |
78 EXTENSION_FUNCTION_VALIDATE(params); | 78 EXTENSION_FUNCTION_VALIDATE(params); |
79 | 79 |
80 scoped_refptr<PermissionSet> permissions = | 80 scoped_refptr<PermissionSet> permissions = |
81 helpers::UnpackPermissionSet( | 81 helpers::UnpackPermissionSet( |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); | 223 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); |
224 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); | 224 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); |
225 install_ui_->ConfirmPermissions( | 225 install_ui_->ConfirmPermissions( |
226 this, GetExtension(), requested_permissions_.get()); | 226 this, GetExtension(), requested_permissions_.get()); |
227 } | 227 } |
228 | 228 |
229 return true; | 229 return true; |
230 } | 230 } |
231 | 231 |
232 } // namespace extensions | 232 } // namespace extensions |
OLD | NEW |