| 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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 } | 530 } |
| 531 return host_content_settings_map_.get(); | 531 return host_content_settings_map_.get(); |
| 532 } | 532 } |
| 533 | 533 |
| 534 virtual HostZoomMap* GetHostZoomMap() { | 534 virtual HostZoomMap* GetHostZoomMap() { |
| 535 if (!host_zoom_map_) | 535 if (!host_zoom_map_) |
| 536 host_zoom_map_ = new HostZoomMap(); | 536 host_zoom_map_ = new HostZoomMap(); |
| 537 return host_zoom_map_.get(); | 537 return host_zoom_map_.get(); |
| 538 } | 538 } |
| 539 | 539 |
| 540 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() { | |
| 541 return profile_->GetGeolocationContentSettingsMap(); | |
| 542 } | |
| 543 | |
| 544 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { | 540 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { |
| 545 return profile_->GetGeolocationPermissionContext(); | 541 return profile_->GetGeolocationPermissionContext(); |
| 546 } | 542 } |
| 547 | 543 |
| 548 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() { | 544 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() { |
| 549 return profile_->GetUserStyleSheetWatcher(); | 545 return profile_->GetUserStyleSheetWatcher(); |
| 550 } | 546 } |
| 551 | 547 |
| 552 virtual FindBarState* GetFindBarState() { | 548 virtual FindBarState* GetFindBarState() { |
| 553 if (!find_bar_state_.get()) | 549 if (!find_bar_state_.get()) |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 }; | 857 }; |
| 862 #endif | 858 #endif |
| 863 | 859 |
| 864 Profile* Profile::CreateOffTheRecordProfile() { | 860 Profile* Profile::CreateOffTheRecordProfile() { |
| 865 #if defined(OS_CHROMEOS) | 861 #if defined(OS_CHROMEOS) |
| 866 if (Profile::IsGuestSession()) | 862 if (Profile::IsGuestSession()) |
| 867 return new GuestSessionProfile(this); | 863 return new GuestSessionProfile(this); |
| 868 #endif | 864 #endif |
| 869 return new OffTheRecordProfileImpl(this); | 865 return new OffTheRecordProfileImpl(this); |
| 870 } | 866 } |
| OLD | NEW |