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

Side by Side Diff: net/url_request/url_request_job_manager.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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 | « net/url_request/url_request_job_manager.h ('k') | ppapi/proxy/interface_list.cc » ('j') | 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) 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 "net/url_request/url_request_job_manager.h" 5 #include "net/url_request/url_request_job_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 23 matching lines...) Expand all
34 { "https", URLRequestHttpJob::Factory }, 34 { "https", URLRequestHttpJob::Factory },
35 35
36 #if !defined(OS_IOS) 36 #if !defined(OS_IOS)
37 { "ws", URLRequestHttpJob::Factory }, 37 { "ws", URLRequestHttpJob::Factory },
38 { "wss", URLRequestHttpJob::Factory }, 38 { "wss", URLRequestHttpJob::Factory },
39 #endif // !defined(OS_IOS) 39 #endif // !defined(OS_IOS)
40 }; 40 };
41 41
42 // static 42 // static
43 URLRequestJobManager* URLRequestJobManager::GetInstance() { 43 URLRequestJobManager* URLRequestJobManager::GetInstance() {
44 return Singleton<URLRequestJobManager>::get(); 44 return base::Singleton<URLRequestJobManager>::get();
45 } 45 }
46 46
47 URLRequestJob* URLRequestJobManager::CreateJob( 47 URLRequestJob* URLRequestJobManager::CreateJob(
48 URLRequest* request, NetworkDelegate* network_delegate) const { 48 URLRequest* request, NetworkDelegate* network_delegate) const {
49 DCHECK(IsAllowedThread()); 49 DCHECK(IsAllowedThread());
50 50
51 // If we are given an invalid URL, then don't even try to inspect the scheme. 51 // If we are given an invalid URL, then don't even try to inspect the scheme.
52 if (!request->url().is_valid()) 52 if (!request->url().is_valid())
53 return new URLRequestErrorJob(request, network_delegate, ERR_INVALID_URL); 53 return new URLRequestErrorJob(request, network_delegate, ERR_INVALID_URL);
54 54
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 return false; 150 return false;
151 } 151 }
152 152
153 URLRequestJobManager::URLRequestJobManager() { 153 URLRequestJobManager::URLRequestJobManager() {
154 } 154 }
155 155
156 URLRequestJobManager::~URLRequestJobManager() {} 156 URLRequestJobManager::~URLRequestJobManager() {}
157 157
158 } // namespace net 158 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_job_manager.h ('k') | ppapi/proxy/interface_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698