OLD | NEW |
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 // This file contains an implementation of the ResourceLoaderBridge class. | 5 // This file contains an implementation of the ResourceLoaderBridge class. |
6 // The class is implemented using URLRequest, meaning it is a "simple" version | 6 // The class is implemented using URLRequest, meaning it is a "simple" version |
7 // that directly issues requests. The more complicated one used in the | 7 // that directly issues requests. The more complicated one used in the |
8 // browser uses IPC. | 8 // browser uses IPC. |
9 // | 9 // |
10 // Because URLRequest only provides an asynchronous resource loading API, this | 10 // Because URLRequest only provides an asynchronous resource loading API, this |
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 // Issue the proxy resolve request on the io thread, and wait | 638 // Issue the proxy resolve request on the io thread, and wait |
639 // for the result. | 639 // for the result. |
640 bool FindProxyForUrl(const GURL& url, std::string* proxy_list) { | 640 bool FindProxyForUrl(const GURL& url, std::string* proxy_list) { |
641 DCHECK(request_context); | 641 DCHECK(request_context); |
642 | 642 |
643 scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service( | 643 scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service( |
644 new net::SyncProxyServiceHelper(io_thread->message_loop(), | 644 new net::SyncProxyServiceHelper(io_thread->message_loop(), |
645 request_context->proxy_service())); | 645 request_context->proxy_service())); |
646 | 646 |
647 net::ProxyInfo proxy_info; | 647 net::ProxyInfo proxy_info; |
648 int rv = sync_proxy_service->ResolveProxy(url, &proxy_info, NULL); | 648 int rv = sync_proxy_service->ResolveProxy(url, &proxy_info, |
| 649 net::BoundNetLog()); |
649 if (rv == net::OK) { | 650 if (rv == net::OK) { |
650 *proxy_list = proxy_info.ToPacString(); | 651 *proxy_list = proxy_info.ToPacString(); |
651 } | 652 } |
652 | 653 |
653 return rv == net::OK; | 654 return rv == net::OK; |
654 } | 655 } |
655 | 656 |
656 } // namespace webkit_glue | 657 } // namespace webkit_glue |
657 | 658 |
658 //----------------------------------------------------------------------------- | 659 //----------------------------------------------------------------------------- |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 } | 732 } |
732 | 733 |
733 // static | 734 // static |
734 void SimpleResourceLoaderBridge::SetAcceptAllCookies(bool accept_all_cookies) { | 735 void SimpleResourceLoaderBridge::SetAcceptAllCookies(bool accept_all_cookies) { |
735 StaticCookiePolicy::Type policy_type = accept_all_cookies ? | 736 StaticCookiePolicy::Type policy_type = accept_all_cookies ? |
736 StaticCookiePolicy::ALLOW_ALL_COOKIES : | 737 StaticCookiePolicy::ALLOW_ALL_COOKIES : |
737 StaticCookiePolicy::BLOCK_THIRD_PARTY_COOKIES; | 738 StaticCookiePolicy::BLOCK_THIRD_PARTY_COOKIES; |
738 static_cast<StaticCookiePolicy*>(request_context->cookie_policy())-> | 739 static_cast<StaticCookiePolicy*>(request_context->cookie_policy())-> |
739 set_type(policy_type); | 740 set_type(policy_type); |
740 } | 741 } |
OLD | NEW |