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

Side by Side Diff: android_webview/browser/net/aw_url_request_job_factory.cc

Issue 12988003: [Android] Fix remaining linker errors for components build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | android_webview/native/webview_native.gyp » ('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 "android_webview/browser/net/aw_url_request_job_factory.h" 5 #include "android_webview/browser/net/aw_url_request_job_factory.h"
6 6
7 #include "net/base/net_errors.h" 7 #include "net/base/net_errors.h"
8 #include "net/url_request/url_request_error_job.h" 8 #include "net/url_request/url_request_error_job.h"
9 #include "net/url_request/url_request_job_factory_impl.h" 9 #include "net/url_request/url_request_job_factory_impl.h"
10 #include "net/url_request/url_request_job_manager.h" 10 #include "net/url_request/url_request_job_manager.h"
(...skipping 29 matching lines...) Expand all
40 URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler( 40 URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
41 const std::string& scheme, 41 const std::string& scheme,
42 URLRequest* request, 42 URLRequest* request,
43 NetworkDelegate* network_delegate) const { 43 NetworkDelegate* network_delegate) const {
44 URLRequestJob* job = next_factory_->MaybeCreateJobWithProtocolHandler( 44 URLRequestJob* job = next_factory_->MaybeCreateJobWithProtocolHandler(
45 scheme, request, network_delegate); 45 scheme, request, network_delegate);
46 46
47 if (job) 47 if (job)
48 return job; 48 return job;
49 49
50 // If the URLRequestJobManager supports the scheme NULL should be returned 50 // If URLRequest supports the scheme NULL should be returned from this method.
51 // from this method. In that case the built in handlers in 51 // In that case the built in handlers will then be used to create the job.
52 // URLRequestJobManager will then be used to create the job. 52 // NOTE(joth): See the assumption in IsHandledProtocol above.
53 if (net::URLRequestJobManager::GetInstance()->SupportsScheme(scheme)) 53 if (net::URLRequest::IsHandledProtocol(scheme))
54 return NULL; 54 return NULL;
55 55
56 return new net::URLRequestErrorJob( 56 return new net::URLRequestErrorJob(
57 request, network_delegate, net::ERR_UNKNOWN_URL_SCHEME); 57 request, network_delegate, net::ERR_UNKNOWN_URL_SCHEME);
58 } 58 }
59 59
60 bool AwURLRequestJobFactory::SetProtocolHandler( 60 bool AwURLRequestJobFactory::SetProtocolHandler(
61 const std::string& scheme, 61 const std::string& scheme,
62 ProtocolHandler* protocol_handler) { 62 ProtocolHandler* protocol_handler) {
63 return next_factory_->SetProtocolHandler(scheme, protocol_handler); 63 return next_factory_->SetProtocolHandler(scheme, protocol_handler);
64 } 64 }
65 65
66 } // namespace android_webview 66 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/native/webview_native.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698