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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 7716003: WIP: URL blacklisting by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewed Created 9 years, 3 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 28 matching lines...) Expand all
39 class DnsCertProvenanceChecker; 39 class DnsCertProvenanceChecker;
40 class HttpTransactionFactory; 40 class HttpTransactionFactory;
41 class NetLog; 41 class NetLog;
42 class OriginBoundCertService; 42 class OriginBoundCertService;
43 class ProxyConfigService; 43 class ProxyConfigService;
44 class ProxyService; 44 class ProxyService;
45 class SSLConfigService; 45 class SSLConfigService;
46 class TransportSecurityState; 46 class TransportSecurityState;
47 } // namespace net 47 } // namespace net
48 48
49 namespace policy {
50 class URLBlacklistManager;
51 } // namespace policy
52
49 namespace prerender { 53 namespace prerender {
50 class PrerenderManager; 54 class PrerenderManager;
51 }; // namespace prerender 55 }; // namespace prerender
52 56
53 namespace quota { 57 namespace quota {
54 class QuotaManager; 58 class QuotaManager;
55 }; // namespace quota 59 }; // namespace quota
56 60
57 namespace webkit_database { 61 namespace webkit_database {
58 class DatabaseTracker; 62 class DatabaseTracker;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 scoped_refptr<fileapi::FileSystemContext> file_system_context; 149 scoped_refptr<fileapi::FileSystemContext> file_system_context;
146 scoped_refptr<quota::QuotaManager> quota_manager; 150 scoped_refptr<quota::QuotaManager> quota_manager;
147 scoped_refptr<ExtensionInfoMap> extension_info_map; 151 scoped_refptr<ExtensionInfoMap> extension_info_map;
148 DesktopNotificationService* notification_service; 152 DesktopNotificationService* notification_service;
149 base::Callback<prerender::PrerenderManager*(void)> prerender_manager_getter; 153 base::Callback<prerender::PrerenderManager*(void)> prerender_manager_getter;
150 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry; 154 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
151 // We need to initialize the ProxyConfigService from the UI thread 155 // We need to initialize the ProxyConfigService from the UI thread
152 // because on linux it relies on initializing things through gconf, 156 // because on linux it relies on initializing things through gconf,
153 // and needs to be on the main thread. 157 // and needs to be on the main thread.
154 scoped_ptr<net::ProxyConfigService> proxy_config_service; 158 scoped_ptr<net::ProxyConfigService> proxy_config_service;
159 // Initialized on the UI thread because it needs to reference the
160 // Profile's PrefService.
161 scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager;
155 // The profile this struct was populated from. It's passed as a void* to 162 // The profile this struct was populated from. It's passed as a void* to
156 // ensure it's not accidently used on the IO thread. Before using it on the 163 // ensure it's not accidently used on the IO thread. Before using it on the
157 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 164 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
158 void* profile; 165 void* profile;
159 166
160 }; 167 };
161 168
162 explicit ProfileIOData(bool is_incognito); 169 explicit ProfileIOData(bool is_incognito);
163 170
164 void InitializeProfileParams(Profile* profile); 171 void InitializeProfileParams(Profile* profile);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 258
252 // Data from the UI thread from the Profile, used to initialize ProfileIOData. 259 // Data from the UI thread from the Profile, used to initialize ProfileIOData.
253 // Deleted after lazy initialization. 260 // Deleted after lazy initialization.
254 mutable scoped_ptr<ProfileParams> profile_params_; 261 mutable scoped_ptr<ProfileParams> profile_params_;
255 262
256 // Member variables which are pointed to by the various context objects. 263 // Member variables which are pointed to by the various context objects.
257 mutable BooleanPrefMember enable_referrers_; 264 mutable BooleanPrefMember enable_referrers_;
258 mutable BooleanPrefMember clear_local_state_on_exit_; 265 mutable BooleanPrefMember clear_local_state_on_exit_;
259 mutable BooleanPrefMember safe_browsing_enabled_; 266 mutable BooleanPrefMember safe_browsing_enabled_;
260 267
268 // Pointed to by NetworkDelegate.
269 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
270
261 // Pointed to by URLRequestContext. 271 // Pointed to by URLRequestContext.
262 mutable scoped_ptr<ChromeURLDataManagerBackend> 272 mutable scoped_ptr<ChromeURLDataManagerBackend>
263 chrome_url_data_manager_backend_; 273 chrome_url_data_manager_backend_;
264 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_; 274 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
265 mutable scoped_ptr<net::NetworkDelegate> network_delegate_; 275 mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
266 mutable scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_; 276 mutable scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_;
267 mutable scoped_ptr<net::ProxyService> proxy_service_; 277 mutable scoped_ptr<net::ProxyService> proxy_service_;
268 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_; 278 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
269 279
270 // Pointed to by ResourceContext. 280 // Pointed to by ResourceContext.
(...skipping 17 matching lines...) Expand all
288 // called. 298 // called.
289 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; 299 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
290 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; 300 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
291 // One AppRequestContext per isolated app. 301 // One AppRequestContext per isolated app.
292 mutable AppRequestContextMap app_request_context_map_; 302 mutable AppRequestContextMap app_request_context_map_;
293 303
294 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 304 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
295 }; 305 };
296 306
297 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 307 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698