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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 // Retrieve the host content settings map of the parent profile in order to | 477 // Retrieve the host content settings map of the parent profile in order to |
478 // ensure the preferences have been migrated. | 478 // ensure the preferences have been migrated. |
479 profile_->GetHostContentSettingsMap(); | 479 profile_->GetHostContentSettingsMap(); |
480 if (!host_content_settings_map_.get()) | 480 if (!host_content_settings_map_.get()) |
481 host_content_settings_map_ = new HostContentSettingsMap(this); | 481 host_content_settings_map_ = new HostContentSettingsMap(this); |
482 return host_content_settings_map_.get(); | 482 return host_content_settings_map_.get(); |
483 } | 483 } |
484 | 484 |
485 virtual HostZoomMap* GetHostZoomMap() { | 485 virtual HostZoomMap* GetHostZoomMap() { |
486 if (!host_zoom_map_) | 486 if (!host_zoom_map_) |
487 host_zoom_map_ = new HostZoomMap(this); | 487 host_zoom_map_ = new HostZoomMap(); |
488 return host_zoom_map_.get(); | 488 return host_zoom_map_.get(); |
489 } | 489 } |
490 | 490 |
491 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() { | 491 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() { |
492 return profile_->GetGeolocationContentSettingsMap(); | 492 return profile_->GetGeolocationContentSettingsMap(); |
493 } | 493 } |
494 | 494 |
495 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { | 495 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { |
496 return profile_->GetGeolocationPermissionContext(); | 496 return profile_->GetGeolocationPermissionContext(); |
497 } | 497 } |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
815 }; | 815 }; |
816 #endif | 816 #endif |
817 | 817 |
818 Profile* Profile::CreateOffTheRecordProfile() { | 818 Profile* Profile::CreateOffTheRecordProfile() { |
819 #if defined(OS_CHROMEOS) | 819 #if defined(OS_CHROMEOS) |
820 if (Profile::IsGuestSession()) | 820 if (Profile::IsGuestSession()) |
821 return new GuestSessionProfile(this); | 821 return new GuestSessionProfile(this); |
822 #endif | 822 #endif |
823 return new OffTheRecordProfileImpl(this); | 823 return new OffTheRecordProfileImpl(this); |
824 } | 824 } |
OLD | NEW |