| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "chrome/common/appcache/chrome_appcache_service.h" | 6 #include "chrome/common/appcache/chrome_appcache_service.h" |
| 7 #include "chrome/common/net/cookie_monster_sqlite.h" | |
| 8 #include "chrome/common/notification_registrar.h" | 7 #include "chrome/common/notification_registrar.h" |
| 9 #include "chrome/common/pref_service.h" | 8 #include "chrome/common/pref_service.h" |
| 10 #include "net/url_request/url_request_context.h" | 9 #include "net/url_request/url_request_context.h" |
| 11 | 10 |
| 12 class Blacklist; | 11 class Blacklist; |
| 13 class CommandLine; | 12 class CommandLine; |
| 14 class Profile; | 13 class Profile; |
| 15 | 14 |
| 16 namespace net { | 15 namespace net { |
| 17 class ProxyConfig; | 16 class ProxyConfig; |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 128 |
| 130 PrefService* prefs_; | 129 PrefService* prefs_; |
| 131 const Blacklist* blacklist_; | 130 const Blacklist* blacklist_; |
| 132 bool is_media_; | 131 bool is_media_; |
| 133 bool is_off_the_record_; | 132 bool is_off_the_record_; |
| 134 }; | 133 }; |
| 135 | 134 |
| 136 // Creates a proxy configuration using the overrides specified on the command | 135 // Creates a proxy configuration using the overrides specified on the command |
| 137 // line. Returns NULL if the system defaults should be used instead. | 136 // line. Returns NULL if the system defaults should be used instead. |
| 138 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line); | 137 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line); |
| OLD | NEW |