Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Side by Side Diff: extensions/common/permissions/permissions_data.cc

Issue 1057753003: [Extensions] Fix thread-safety bug in PermissionsData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Jeffrey's Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/public/common/url_constants.h" 8 #include "content/public/common/url_constants.h"
9 #include "extensions/common/constants.h" 9 #include "extensions/common/constants.h"
10 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 if (error) 313 if (error)
314 *error = manifest_errors::kActiveTabPermissionNotGranted; 314 *error = manifest_errors::kActiveTabPermissionNotGranted;
315 return false; 315 return false;
316 } 316 }
317 317
318 if (error) 318 if (error)
319 *error = manifest_errors::kAllURLOrActiveTabNeeded; 319 *error = manifest_errors::kAllURLOrActiveTabNeeded;
320 return false; 320 return false;
321 } 321 }
322 322
323 PermissionsData::TabPermissionsMap
324 PermissionsData::CopyTabSpecificPermissionsMap() const {
325 base::AutoLock auto_lock(runtime_lock_);
326 return tab_specific_permissions_;
327 }
328
323 scoped_refptr<const PermissionSet> PermissionsData::GetTabSpecificPermissions( 329 scoped_refptr<const PermissionSet> PermissionsData::GetTabSpecificPermissions(
324 int tab_id) const { 330 int tab_id) const {
325 base::AutoLock auto_lock(runtime_lock_); 331 base::AutoLock auto_lock(runtime_lock_);
326 CHECK_GE(tab_id, 0); 332 CHECK_GE(tab_id, 0);
327 TabPermissionsMap::const_iterator iter = 333 TabPermissionsMap::const_iterator iter =
328 tab_specific_permissions_.find(tab_id); 334 tab_specific_permissions_.find(tab_id);
329 return (iter != tab_specific_permissions_.end()) ? iter->second : NULL; 335 return (iter != tab_specific_permissions_.end()) ? iter->second : NULL;
330 } 336 }
331 337
332 bool PermissionsData::HasTabSpecificPermissionToExecuteScript( 338 bool PermissionsData::HasTabSpecificPermissionToExecuteScript(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 return ACCESS_WITHHELD; 377 return ACCESS_WITHHELD;
372 378
373 if (error) { 379 if (error) {
374 *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage, 380 *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage,
375 document_url.spec()); 381 document_url.spec());
376 } 382 }
377 return ACCESS_DENIED; 383 return ACCESS_DENIED;
378 } 384 }
379 385
380 } // namespace extensions 386 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698