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

Side by Side Diff: chrome/browser/policy/device_management_service.cc

Issue 10203002: Make URLRequestThrottlerManager a member of URLRequestContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR (pure merge) Created 8 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
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 "chrome/browser/policy/device_management_service.h" 5 #include "chrome/browser/policy/device_management_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 DeviceManagementRequestContext::DeviceManagementRequestContext( 197 DeviceManagementRequestContext::DeviceManagementRequestContext(
198 net::URLRequestContext* base_context) { 198 net::URLRequestContext* base_context) {
199 // Share resolver, proxy service and ssl bits with the baseline context. This 199 // Share resolver, proxy service and ssl bits with the baseline context. This
200 // is important so we don't make redundant requests (e.g. when resolving proxy 200 // is important so we don't make redundant requests (e.g. when resolving proxy
201 // auto configuration). 201 // auto configuration).
202 set_net_log(base_context->net_log()); 202 set_net_log(base_context->net_log());
203 set_host_resolver(base_context->host_resolver()); 203 set_host_resolver(base_context->host_resolver());
204 set_proxy_service(base_context->proxy_service()); 204 set_proxy_service(base_context->proxy_service());
205 set_ssl_config_service(base_context->ssl_config_service()); 205 set_ssl_config_service(base_context->ssl_config_service());
206 206
207 // Share the throttler manager.
208 set_throttler_manager(base_context->throttler_manager());
willchan no longer on Chromium 2012/04/27 17:39:26 why?
209
207 // Share the http session. 210 // Share the http session.
208 set_http_transaction_factory( 211 set_http_transaction_factory(
209 new net::HttpNetworkLayer( 212 new net::HttpNetworkLayer(
210 base_context->http_transaction_factory()->GetSession())); 213 base_context->http_transaction_factory()->GetSession()));
211 214
212 // No cookies, please. 215 // No cookies, please.
213 set_cookie_store(new net::CookieMonster(NULL, NULL)); 216 set_cookie_store(new net::CookieMonster(NULL, NULL));
214 217
215 // Initialize these to sane values for our purposes. 218 // Initialize these to sane values for our purposes.
216 set_accept_language("*"); 219 set_accept_language("*");
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 } 589 }
587 } 590 }
588 591
589 const JobQueue::iterator elem = 592 const JobQueue::iterator elem =
590 std::find(queued_jobs_.begin(), queued_jobs_.end(), job); 593 std::find(queued_jobs_.begin(), queued_jobs_.end(), job);
591 if (elem != queued_jobs_.end()) 594 if (elem != queued_jobs_.end())
592 queued_jobs_.erase(elem); 595 queued_jobs_.erase(elem);
593 } 596 }
594 597
595 } // namespace policy 598 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/browser/profiles/off_the_record_profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698