| OLD | NEW |
| 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 374 |
| 375 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp( | 375 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp( |
| 376 const std::string& app_id) { | 376 const std::string& app_id) { |
| 377 return io_data_.GetIsolatedAppRequestContextGetter(app_id); | 377 return io_data_.GetIsolatedAppRequestContextGetter(app_id); |
| 378 } | 378 } |
| 379 | 379 |
| 380 virtual const content::ResourceContext& GetResourceContext() { | 380 virtual const content::ResourceContext& GetResourceContext() { |
| 381 return io_data_.GetResourceContext(); | 381 return io_data_.GetResourceContext(); |
| 382 } | 382 } |
| 383 | 383 |
| 384 virtual net::SpdyConfigService* GetSpdyConfigService() { |
| 385 return profile_->GetSpdyConfigService(); |
| 386 } |
| 387 |
| 384 virtual net::SSLConfigService* GetSSLConfigService() { | 388 virtual net::SSLConfigService* GetSSLConfigService() { |
| 385 return profile_->GetSSLConfigService(); | 389 return profile_->GetSSLConfigService(); |
| 386 } | 390 } |
| 387 | 391 |
| 388 virtual HostContentSettingsMap* GetHostContentSettingsMap() { | 392 virtual HostContentSettingsMap* GetHostContentSettingsMap() { |
| 389 // Retrieve the host content settings map of the parent profile in order to | 393 // Retrieve the host content settings map of the parent profile in order to |
| 390 // ensure the preferences have been migrated. | 394 // ensure the preferences have been migrated. |
| 391 profile_->GetHostContentSettingsMap(); | 395 profile_->GetHostContentSettingsMap(); |
| 392 if (!host_content_settings_map_.get()) { | 396 if (!host_content_settings_map_.get()) { |
| 393 host_content_settings_map_ = new HostContentSettingsMap( | 397 host_content_settings_map_ = new HostContentSettingsMap( |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 }; | 722 }; |
| 719 #endif | 723 #endif |
| 720 | 724 |
| 721 Profile* Profile::CreateOffTheRecordProfile() { | 725 Profile* Profile::CreateOffTheRecordProfile() { |
| 722 #if defined(OS_CHROMEOS) | 726 #if defined(OS_CHROMEOS) |
| 723 if (Profile::IsGuestSession()) | 727 if (Profile::IsGuestSession()) |
| 724 return new GuestSessionProfile(this); | 728 return new GuestSessionProfile(this); |
| 725 #endif | 729 #endif |
| 726 return new OffTheRecordProfileImpl(this); | 730 return new OffTheRecordProfileImpl(this); |
| 727 } | 731 } |
| OLD | NEW |