| 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" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 enum AutoConfirmForTest { | 41 enum AutoConfirmForTest { |
| 42 DO_NOT_SKIP = 0, | 42 DO_NOT_SKIP = 0, |
| 43 PROCEED, | 43 PROCEED, |
| 44 ABORT | 44 ABORT |
| 45 }; | 45 }; |
| 46 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP; | 46 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP; |
| 47 bool ignore_user_gesture_for_tests = false; | 47 bool ignore_user_gesture_for_tests = false; |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 bool PermissionsContainsFunction::RunImpl() { | 51 bool PermissionsContainsFunction::RunSync() { |
| 52 scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_)); | 52 scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_)); |
| 53 EXTENSION_FUNCTION_VALIDATE(params); | 53 EXTENSION_FUNCTION_VALIDATE(params); |
| 54 | 54 |
| 55 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( | 55 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( |
| 56 params->permissions, | 56 params->permissions, |
| 57 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), | 57 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), |
| 58 &error_); | 58 &error_); |
| 59 if (!permissions.get()) | 59 if (!permissions.get()) |
| 60 return false; | 60 return false; |
| 61 | 61 |
| 62 results_ = Contains::Results::Create( | 62 results_ = Contains::Results::Create( |
| 63 GetExtension()->GetActivePermissions()->Contains(*permissions.get())); | 63 GetExtension()->GetActivePermissions()->Contains(*permissions.get())); |
| 64 return true; | 64 return true; |
| 65 } | 65 } |
| 66 | 66 |
| 67 bool PermissionsGetAllFunction::RunImpl() { | 67 bool PermissionsGetAllFunction::RunSync() { |
| 68 scoped_ptr<Permissions> permissions = | 68 scoped_ptr<Permissions> permissions = |
| 69 helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); | 69 helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); |
| 70 results_ = GetAll::Results::Create(*permissions); | 70 results_ = GetAll::Results::Create(*permissions); |
| 71 return true; | 71 return true; |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool PermissionsRemoveFunction::RunImpl() { | 74 bool PermissionsRemoveFunction::RunSync() { |
| 75 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); | 75 scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); |
| 76 EXTENSION_FUNCTION_VALIDATE(params); | 76 EXTENSION_FUNCTION_VALIDATE(params); |
| 77 | 77 |
| 78 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( | 78 scoped_refptr<PermissionSet> permissions = helpers::UnpackPermissionSet( |
| 79 params->permissions, | 79 params->permissions, |
| 80 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), | 80 ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()), |
| 81 &error_); | 81 &error_); |
| 82 if (!permissions.get()) | 82 if (!permissions.get()) |
| 83 return false; | 83 return false; |
| 84 | 84 |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); | 214 CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); |
| 215 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); | 215 install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents())); |
| 216 install_ui_->ConfirmPermissions( | 216 install_ui_->ConfirmPermissions( |
| 217 this, GetExtension(), requested_permissions_.get()); | 217 this, GetExtension(), requested_permissions_.get()); |
| 218 } | 218 } |
| 219 | 219 |
| 220 return true; | 220 return true; |
| 221 } | 221 } |
| 222 | 222 |
| 223 } // namespace extensions | 223 } // namespace extensions |
| OLD | NEW |