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

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

Issue 11273049: Revert 164120 - content/browser: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/cross_site_request_manager.h" 5 #include "content/browser/cross_site_request_manager.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 8
9 namespace content {
10
11 bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id, 9 bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id,
12 int render_view_id) { 10 int render_view_id) {
13 base::AutoLock lock(lock_); 11 base::AutoLock lock(lock_);
14 12
15 std::pair<int, int> key(renderer_id, render_view_id); 13 std::pair<int, int> key(renderer_id, render_view_id);
16 return pending_cross_site_views_.find(key) != 14 return pending_cross_site_views_.find(key) !=
17 pending_cross_site_views_.end(); 15 pending_cross_site_views_.end();
18 } 16 }
19 17
20 void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id, 18 void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id,
(...skipping 10 matching lines...) Expand all
31 } 29 }
32 30
33 CrossSiteRequestManager::CrossSiteRequestManager() {} 31 CrossSiteRequestManager::CrossSiteRequestManager() {}
34 32
35 CrossSiteRequestManager::~CrossSiteRequestManager() {} 33 CrossSiteRequestManager::~CrossSiteRequestManager() {}
36 34
37 // static 35 // static
38 CrossSiteRequestManager* CrossSiteRequestManager::GetInstance() { 36 CrossSiteRequestManager* CrossSiteRequestManager::GetInstance() {
39 return Singleton<CrossSiteRequestManager>::get(); 37 return Singleton<CrossSiteRequestManager>::get();
40 } 38 }
41
42 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/cross_site_request_manager.h ('k') | content/browser/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698