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

Side by Side Diff: chrome/browser/net/chrome_url_request_context.cc

Issue 6549007: Make CrOS proxy configuration write prefs directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove default request context proxy config service patch. Created 9 years, 10 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) 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 "chrome/browser/net/chrome_url_request_context.h" 5 #include "chrome/browser/net/chrome_url_request_context.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/message_loop_proxy.h" 8 #include "base/message_loop_proxy.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/browser_thread.h" 10 #include "chrome/browser/browser_thread.h"
(...skipping 10 matching lines...) Expand all
21 #include "net/http/http_util.h" 21 #include "net/http/http_util.h"
22 #include "webkit/glue/webkit_glue.h" 22 #include "webkit/glue/webkit_glue.h"
23 23
24 #if defined(USE_NSS) 24 #if defined(USE_NSS)
25 #include "net/ocsp/nss_ocsp.h" 25 #include "net/ocsp/nss_ocsp.h"
26 #endif 26 #endif
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "chrome/browser/chromeos/cros/cros_library.h" 29 #include "chrome/browser/chromeos/cros/cros_library.h"
30 #include "chrome/browser/chromeos/cros/libcros_service_library.h" 30 #include "chrome/browser/chromeos/cros/libcros_service_library.h"
31 #include "chrome/browser/chromeos/proxy_config_service.h"
32 #endif // defined(OS_CHROMEOS) 31 #endif // defined(OS_CHROMEOS)
33 32
34 class ChromeURLRequestContextFactory { 33 class ChromeURLRequestContextFactory {
35 public: 34 public:
36 ChromeURLRequestContextFactory() {} 35 ChromeURLRequestContextFactory() {}
37 virtual ~ChromeURLRequestContextFactory() {} 36 virtual ~ChromeURLRequestContextFactory() {}
38 37
39 // Called to create a new instance (will only be called once). 38 // Called to create a new instance (will only be called once).
40 virtual scoped_refptr<ChromeURLRequestContext> Create() = 0; 39 virtual scoped_refptr<ChromeURLRequestContext> Create() = 0;
41 40
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 net::HttpUtil::GenerateAcceptLanguageHeader(accept_language)); 376 net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
378 } 377 }
379 378
380 void ChromeURLRequestContext::OnDefaultCharsetChange( 379 void ChromeURLRequestContext::OnDefaultCharsetChange(
381 const std::string& default_charset) { 380 const std::string& default_charset) {
382 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 381 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
383 set_referrer_charset(default_charset); 382 set_referrer_charset(default_charset);
384 set_accept_charset( 383 set_accept_charset(
385 net::HttpUtil::GenerateAcceptCharsetHeader(default_charset)); 384 net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
386 } 385 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698