| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "extensions/common/permissions/permissions_data.h" | 5 #include "extensions/common/permissions/permissions_data.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 return false; | 127 return false; |
| 128 } | 128 } |
| 129 | 129 |
| 130 void PermissionsData::BindToCurrentThread() const { | 130 void PermissionsData::BindToCurrentThread() const { |
| 131 DCHECK(!thread_checker_); | 131 DCHECK(!thread_checker_); |
| 132 thread_checker_.reset(new base::ThreadChecker()); | 132 thread_checker_.reset(new base::ThreadChecker()); |
| 133 } | 133 } |
| 134 | 134 |
| 135 void PermissionsData::SetPermissions( | 135 void PermissionsData::SetPermissions( |
| 136 scoped_ptr<const PermissionSet> active, | 136 std::unique_ptr<const PermissionSet> active, |
| 137 scoped_ptr<const PermissionSet> withheld) const { | 137 std::unique_ptr<const PermissionSet> withheld) const { |
| 138 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); | 138 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); |
| 139 active_permissions_unsafe_ = std::move(active); | 139 active_permissions_unsafe_ = std::move(active); |
| 140 withheld_permissions_unsafe_ = std::move(withheld); | 140 withheld_permissions_unsafe_ = std::move(withheld); |
| 141 } | 141 } |
| 142 | 142 |
| 143 void PermissionsData::SetActivePermissions( | 143 void PermissionsData::SetActivePermissions( |
| 144 scoped_ptr<const PermissionSet> active) const { | 144 std::unique_ptr<const PermissionSet> active) const { |
| 145 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); | 145 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); |
| 146 active_permissions_unsafe_ = std::move(active); | 146 active_permissions_unsafe_ = std::move(active); |
| 147 } | 147 } |
| 148 | 148 |
| 149 void PermissionsData::UpdateTabSpecificPermissions( | 149 void PermissionsData::UpdateTabSpecificPermissions( |
| 150 int tab_id, | 150 int tab_id, |
| 151 const PermissionSet& permissions) const { | 151 const PermissionSet& permissions) const { |
| 152 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); | 152 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); |
| 153 CHECK_GE(tab_id, 0); | 153 CHECK_GE(tab_id, 0); |
| 154 TabPermissionsMap::const_iterator iter = | 154 TabPermissionsMap::const_iterator iter = |
| 155 tab_specific_permissions_.find(tab_id); | 155 tab_specific_permissions_.find(tab_id); |
| 156 scoped_ptr<const PermissionSet> new_permissions = PermissionSet::CreateUnion( | 156 std::unique_ptr<const PermissionSet> new_permissions = |
| 157 iter == tab_specific_permissions_.end() | 157 PermissionSet::CreateUnion( |
| 158 ? static_cast<const PermissionSet&>(PermissionSet()) | 158 iter == tab_specific_permissions_.end() |
| 159 : *iter->second, | 159 ? static_cast<const PermissionSet&>(PermissionSet()) |
| 160 permissions); | 160 : *iter->second, |
| 161 permissions); |
| 161 tab_specific_permissions_[tab_id] = std::move(new_permissions); | 162 tab_specific_permissions_[tab_id] = std::move(new_permissions); |
| 162 } | 163 } |
| 163 | 164 |
| 164 void PermissionsData::ClearTabSpecificPermissions(int tab_id) const { | 165 void PermissionsData::ClearTabSpecificPermissions(int tab_id) const { |
| 165 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); | 166 AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get()); |
| 166 CHECK_GE(tab_id, 0); | 167 CHECK_GE(tab_id, 0); |
| 167 tab_specific_permissions_.erase(tab_id); | 168 tab_specific_permissions_.erase(tab_id); |
| 168 } | 169 } |
| 169 | 170 |
| 170 bool PermissionsData::HasAPIPermission(APIPermission::ID permission) const { | 171 bool PermissionsData::HasAPIPermission(APIPermission::ID permission) const { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 manifest_errors::kCannotAccessPageWithUrl, document_url.spec()); | 360 manifest_errors::kCannotAccessPageWithUrl, document_url.spec()); |
| 360 } else { | 361 } else { |
| 361 *error = manifest_errors::kCannotAccessPage; | 362 *error = manifest_errors::kCannotAccessPage; |
| 362 } | 363 } |
| 363 } | 364 } |
| 364 | 365 |
| 365 return ACCESS_DENIED; | 366 return ACCESS_DENIED; |
| 366 } | 367 } |
| 367 | 368 |
| 368 } // namespace extensions | 369 } // namespace extensions |
| OLD | NEW |