| 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_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/permissions_updater.h" | 10 #include "chrome/browser/extensions/permissions_updater.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 PROCEED, | 37 PROCEED, |
| 38 ABORT | 38 ABORT |
| 39 }; | 39 }; |
| 40 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP; | 40 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP; |
| 41 bool ignore_user_gesture_for_tests = false; | 41 bool ignore_user_gesture_for_tests = false; |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 bool ContainsPermissionsFunction::RunImpl() { | 45 bool ContainsPermissionsFunction::RunImpl() { |
| 46 scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_)); | 46 scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_)); |
| 47 EXTENSION_FUNCTION_VALIDATE(params.get()); | |
| 48 | 47 |
| 49 scoped_refptr<ExtensionPermissionSet> permissions = | 48 scoped_refptr<ExtensionPermissionSet> permissions = |
| 50 UnpackPermissionSet(params->permissions, &error_); | 49 UnpackPermissionSet(params->permissions, &error_); |
| 50 LOG(WARNING) << "IN HERE\n\n\n"; |
| 51 if (!permissions.get()) | 51 if (!permissions.get()) |
| 52 return false; | 52 return false; |
| 53 LOG(WARNING) << "derp HERE\n\n\n"; |
| 53 | 54 |
| 54 result_.reset(Contains::Result::Create( | 55 result_.reset(Contains::Result::Create( |
| 55 GetExtension()->GetActivePermissions()->Contains(*permissions))); | 56 GetExtension()->GetActivePermissions()->Contains(*permissions))); |
| 57 LOG(WARNING) << "OUT HERE\n\n\n"; |
| 56 return true; | 58 return true; |
| 57 } | 59 } |
| 58 | 60 |
| 59 bool GetAllPermissionsFunction::RunImpl() { | 61 bool GetAllPermissionsFunction::RunImpl() { |
| 60 scoped_ptr<Permissions> permissions = | 62 scoped_ptr<Permissions> permissions = |
| 61 PackPermissionSet(GetExtension()->GetActivePermissions()); | 63 PackPermissionSet(GetExtension()->GetActivePermissions()); |
| 62 result_.reset(GetAll::Result::Create(*permissions)); | 64 result_.reset(GetAll::Result::Create(*permissions)); |
| 63 return true; | 65 return true; |
| 64 } | 66 } |
| 65 | 67 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 | 200 |
| 199 Release(); // Balanced in RunImpl(). | 201 Release(); // Balanced in RunImpl(). |
| 200 } | 202 } |
| 201 | 203 |
| 202 void RequestPermissionsFunction::InstallUIAbort(bool user_initiated) { | 204 void RequestPermissionsFunction::InstallUIAbort(bool user_initiated) { |
| 203 result_.reset(Request::Result::Create(false)); | 205 result_.reset(Request::Result::Create(false)); |
| 204 SendResponse(true); | 206 SendResponse(true); |
| 205 | 207 |
| 206 Release(); // Balanced in RunImpl(). | 208 Release(); // Balanced in RunImpl(). |
| 207 } | 209 } |
| OLD | NEW |