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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 6825038: Create a content::ResourceContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test. Created 9 years, 8 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.h ('k') | chrome/browser/profiles/profile_impl.h » ('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 #include "chrome/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 return GetRequestContextForIsolatedApp(installed_app->id()); 420 return GetRequestContextForIsolatedApp(installed_app->id());
421 421
422 return GetRequestContext(); 422 return GetRequestContext();
423 } 423 }
424 424
425 virtual net::URLRequestContextGetter* GetRequestContextForMedia() { 425 virtual net::URLRequestContextGetter* GetRequestContextForMedia() {
426 // In OTR mode, media request context is the same as the original one. 426 // In OTR mode, media request context is the same as the original one.
427 return io_data_.GetMainRequestContextGetter(); 427 return io_data_.GetMainRequestContextGetter();
428 } 428 }
429 429
430 net::URLRequestContextGetter* GetRequestContextForExtensions() { 430 virtual net::URLRequestContextGetter* GetRequestContextForExtensions() {
431 return io_data_.GetExtensionsRequestContextGetter(); 431 return io_data_.GetExtensionsRequestContextGetter();
432 } 432 }
433 433
434 net::URLRequestContextGetter* GetRequestContextForIsolatedApp( 434 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(
435 const std::string& app_id) { 435 const std::string& app_id) {
436 return io_data_.GetIsolatedAppRequestContextGetter(app_id); 436 return io_data_.GetIsolatedAppRequestContextGetter(app_id);
437 } 437 }
438 438
439 virtual const content::ResourceContext& GetResourceContext() {
440 return io_data_.GetResourceContext();
441 }
442
439 virtual net::SSLConfigService* GetSSLConfigService() { 443 virtual net::SSLConfigService* GetSSLConfigService() {
440 return profile_->GetSSLConfigService(); 444 return profile_->GetSSLConfigService();
441 } 445 }
442 446
443 virtual HostContentSettingsMap* GetHostContentSettingsMap() { 447 virtual HostContentSettingsMap* GetHostContentSettingsMap() {
444 // Retrieve the host content settings map of the parent profile in order to 448 // Retrieve the host content settings map of the parent profile in order to
445 // ensure the preferences have been migrated. 449 // ensure the preferences have been migrated.
446 profile_->GetHostContentSettingsMap(); 450 profile_->GetHostContentSettingsMap();
447 if (!host_content_settings_map_.get()) 451 if (!host_content_settings_map_.get())
448 host_content_settings_map_ = new HostContentSettingsMap(this); 452 host_content_settings_map_ = new HostContentSettingsMap(this);
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 }; 772 };
769 #endif 773 #endif
770 774
771 Profile* Profile::CreateOffTheRecordProfile() { 775 Profile* Profile::CreateOffTheRecordProfile() {
772 #if defined(OS_CHROMEOS) 776 #if defined(OS_CHROMEOS)
773 if (Profile::IsGuestSession()) 777 if (Profile::IsGuestSession())
774 return new GuestSessionProfile(this); 778 return new GuestSessionProfile(this);
775 #endif 779 #endif
776 return new OffTheRecordProfileImpl(this); 780 return new OffTheRecordProfileImpl(this);
777 } 781 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698