| 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 #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" | 7 #include "chrome/common/net/cookie_monster_sqlite.h" |
| 8 #include "chrome/common/notification_registrar.h" | 8 #include "chrome/common/notification_registrar.h" |
| 9 #include "chrome/common/pref_service.h" | 9 #include "chrome/common/pref_service.h" |
| 10 #include "net/url_request/url_request_context.h" | 10 #include "net/url_request/url_request_context.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 120 |
| 121 // Maps extension IDs to paths on disk. This is initialized in the | 121 // Maps extension IDs to paths on disk. This is initialized in the |
| 122 // construtor and updated when extensions changed. | 122 // construtor and updated when extensions changed. |
| 123 ExtensionPaths extension_paths_; | 123 ExtensionPaths extension_paths_; |
| 124 | 124 |
| 125 // Path to the directory user scripts are stored in. | 125 // Path to the directory user scripts are stored in. |
| 126 FilePath user_script_dir_path_; | 126 FilePath user_script_dir_path_; |
| 127 | 127 |
| 128 scoped_refptr<ChromeAppCacheService> appcache_service_; | 128 scoped_refptr<ChromeAppCacheService> appcache_service_; |
| 129 | 129 |
| 130 scoped_ptr<SQLitePersistentCookieStore> cookie_db_; | |
| 131 PrefService* prefs_; | 130 PrefService* prefs_; |
| 132 const Blacklist* blacklist_; | 131 const Blacklist* blacklist_; |
| 133 bool is_media_; | 132 bool is_media_; |
| 134 bool is_off_the_record_; | 133 bool is_off_the_record_; |
| 135 }; | 134 }; |
| 136 | 135 |
| 137 // Creates a proxy configuration using the overrides specified on the command | 136 // Creates a proxy configuration using the overrides specified on the command |
| 138 // line. Returns NULL if the system defaults should be used instead. | 137 // line. Returns NULL if the system defaults should be used instead. |
| 139 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line); | 138 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line); |
| OLD | NEW |