| 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 return NULL; | 544 return NULL; |
| 545 } | 545 } |
| 546 | 546 |
| 547 virtual void MarkAsCleanShutdown() { | 547 virtual void MarkAsCleanShutdown() { |
| 548 } | 548 } |
| 549 | 549 |
| 550 virtual void InitExtensions() { | 550 virtual void InitExtensions() { |
| 551 NOTREACHED(); | 551 NOTREACHED(); |
| 552 } | 552 } |
| 553 | 553 |
| 554 virtual void InitWebResources() { | 554 virtual void InitPromoResources() { |
| 555 NOTREACHED(); | 555 NOTREACHED(); |
| 556 } | 556 } |
| 557 | 557 |
| 558 virtual NTPResourceCache* GetNTPResourceCache() { | 558 virtual NTPResourceCache* GetNTPResourceCache() { |
| 559 // Just return the real profile resource cache. | 559 // Just return the real profile resource cache. |
| 560 return profile_->GetNTPResourceCache(); | 560 return profile_->GetNTPResourceCache(); |
| 561 } | 561 } |
| 562 | 562 |
| 563 virtual FilePath last_selected_directory() { | 563 virtual FilePath last_selected_directory() { |
| 564 const FilePath& directory = last_selected_directory_; | 564 const FilePath& directory = last_selected_directory_; |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 }; | 732 }; |
| 733 #endif | 733 #endif |
| 734 | 734 |
| 735 Profile* Profile::CreateOffTheRecordProfile() { | 735 Profile* Profile::CreateOffTheRecordProfile() { |
| 736 #if defined(OS_CHROMEOS) | 736 #if defined(OS_CHROMEOS) |
| 737 if (Profile::IsGuestSession()) | 737 if (Profile::IsGuestSession()) |
| 738 return new GuestSessionProfile(this); | 738 return new GuestSessionProfile(this); |
| 739 #endif | 739 #endif |
| 740 return new OffTheRecordProfileImpl(this); | 740 return new OffTheRecordProfileImpl(this); |
| 741 } | 741 } |
| OLD | NEW |