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

Side by Side Diff: chrome/browser/cross_site_request_manager.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/cross_site_request_manager.h" 5 #include "chrome/browser/cross_site_request_manager.h"
6 6
7 #include "base/singleton.h" 7 #include "base/singleton.h"
8 8
9 bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id, 9 bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id,
10 int render_view_id) { 10 int render_view_id) {
11 AutoLock lock(lock_); 11 base::AutoLock lock(lock_);
12 12
13 std::pair<int, int> key(renderer_id, render_view_id); 13 std::pair<int, int> key(renderer_id, render_view_id);
14 return pending_cross_site_views_.find(key) != 14 return pending_cross_site_views_.find(key) !=
15 pending_cross_site_views_.end(); 15 pending_cross_site_views_.end();
16 } 16 }
17 17
18 void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id, 18 void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id,
19 int render_view_id, 19 int render_view_id,
20 bool has_pending) { 20 bool has_pending) {
21 AutoLock lock(lock_); 21 base::AutoLock lock(lock_);
22 22
23 std::pair<int, int> key(renderer_id, render_view_id); 23 std::pair<int, int> key(renderer_id, render_view_id);
24 if (has_pending) { 24 if (has_pending) {
25 pending_cross_site_views_.insert(key); 25 pending_cross_site_views_.insert(key);
26 } else { 26 } else {
27 pending_cross_site_views_.erase(key); 27 pending_cross_site_views_.erase(key);
28 } 28 }
29 } 29 }
30 30
31 CrossSiteRequestManager::CrossSiteRequestManager() {} 31 CrossSiteRequestManager::CrossSiteRequestManager() {}
32 32
33 CrossSiteRequestManager::~CrossSiteRequestManager() {} 33 CrossSiteRequestManager::~CrossSiteRequestManager() {}
34 34
35 // static 35 // static
36 CrossSiteRequestManager* CrossSiteRequestManager::GetInstance() { 36 CrossSiteRequestManager* CrossSiteRequestManager::GetInstance() {
37 return Singleton<CrossSiteRequestManager>::get(); 37 return Singleton<CrossSiteRequestManager>::get();
38 } 38 }
OLDNEW
« no previous file with comments | « chrome/browser/cross_site_request_manager.h ('k') | chrome/browser/device_orientation/provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698