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

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

Issue 10834215: Remove static variables from HttpStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 8 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
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 #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 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "chrome/browser/api/prefs/pref_member.h" 17 #include "chrome/browser/api/prefs/pref_member.h"
18 #include "chrome/browser/io_thread.h" 18 #include "chrome/browser/io_thread.h"
19 #include "chrome/browser/net/chrome_url_request_context.h" 19 #include "chrome/browser/net/chrome_url_request_context.h"
20 #include "content/public/browser/resource_context.h" 20 #include "content/public/browser/resource_context.h"
21 #include "net/cookies/cookie_monster.h" 21 #include "net/cookies/cookie_monster.h"
22 #include "net/http/http_network_session.h"
22 #include "net/url_request/url_request_job_factory.h" 23 #include "net/url_request/url_request_job_factory.h"
23 24
24 class CookieSettings; 25 class CookieSettings;
25 class DesktopNotificationService; 26 class DesktopNotificationService;
26 class ExtensionInfoMap; 27 class ExtensionInfoMap;
27 class HostContentSettingsMap; 28 class HostContentSettingsMap;
28 class Profile; 29 class Profile;
29 class ProtocolHandlerRegistry; 30 class ProtocolHandlerRegistry;
30 class TransportSecurityPersister; 31 class TransportSecurityPersister;
31 32
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 264
264 chrome_browser_net::LoadTimeStats* load_time_stats() const { 265 chrome_browser_net::LoadTimeStats* load_time_stats() const {
265 return load_time_stats_; 266 return load_time_stats_;
266 } 267 }
267 268
268 // Destroys the ResourceContext first, to cancel any URLRequests that are 269 // Destroys the ResourceContext first, to cancel any URLRequests that are
269 // using it still, before we destroy the member variables that those 270 // using it still, before we destroy the member variables that those
270 // URLRequests may be accessing. 271 // URLRequests may be accessing.
271 void DestroyResourceContext(); 272 void DestroyResourceContext();
272 273
274 // Fills in fields of params using values from main_request_context_ and the
275 // IOThread associated with profile_params.
276 void PopulateNetworkSessionParams(
277 const ProfileParams* profile_params,
278 net::HttpNetworkSession::Params* params) const;
279
273 private: 280 private:
274 class ResourceContext : public content::ResourceContext { 281 class ResourceContext : public content::ResourceContext {
275 public: 282 public:
276 explicit ResourceContext(ProfileIOData* io_data); 283 explicit ResourceContext(ProfileIOData* io_data);
277 virtual ~ResourceContext(); 284 virtual ~ResourceContext();
278 285
279 // ResourceContext implementation: 286 // ResourceContext implementation:
280 virtual net::HostResolver* GetHostResolver() OVERRIDE; 287 virtual net::HostResolver* GetHostResolver() OVERRIDE;
281 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 288 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
282 289
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 416
410 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 417 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
411 bool initialized_on_UI_thread_; 418 bool initialized_on_UI_thread_;
412 419
413 bool is_incognito_; 420 bool is_incognito_;
414 421
415 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 422 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
416 }; 423 };
417 424
418 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 425 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698