| 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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 virtual VisitedLinkMaster* GetVisitedLinkMaster() { | 287 virtual VisitedLinkMaster* GetVisitedLinkMaster() { |
| 288 // We don't provide access to the VisitedLinkMaster when we're OffTheRecord | 288 // We don't provide access to the VisitedLinkMaster when we're OffTheRecord |
| 289 // because we don't want to leak the sites that the user has visited before. | 289 // because we don't want to leak the sites that the user has visited before. |
| 290 return NULL; | 290 return NULL; |
| 291 } | 291 } |
| 292 | 292 |
| 293 virtual ExtensionService* GetExtensionService() { | 293 virtual ExtensionService* GetExtensionService() { |
| 294 return GetOriginalProfile()->GetExtensionService(); | 294 return GetOriginalProfile()->GetExtensionService(); |
| 295 } | 295 } |
| 296 | 296 |
| 297 virtual StatusTray* GetStatusTray() { | |
| 298 return GetOriginalProfile()->GetStatusTray(); | |
| 299 } | |
| 300 | |
| 301 virtual UserScriptMaster* GetUserScriptMaster() { | 297 virtual UserScriptMaster* GetUserScriptMaster() { |
| 302 return GetOriginalProfile()->GetUserScriptMaster(); | 298 return GetOriginalProfile()->GetUserScriptMaster(); |
| 303 } | 299 } |
| 304 | 300 |
| 305 virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() { | 301 virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() { |
| 306 // TODO(mpcomplete): figure out whether we should return the original | 302 // TODO(mpcomplete): figure out whether we should return the original |
| 307 // profile's version. | 303 // profile's version. |
| 308 return NULL; | 304 return NULL; |
| 309 } | 305 } |
| 310 | 306 |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 }; | 811 }; |
| 816 #endif | 812 #endif |
| 817 | 813 |
| 818 Profile* Profile::CreateOffTheRecordProfile() { | 814 Profile* Profile::CreateOffTheRecordProfile() { |
| 819 #if defined(OS_CHROMEOS) | 815 #if defined(OS_CHROMEOS) |
| 820 if (Profile::IsGuestSession()) | 816 if (Profile::IsGuestSession()) |
| 821 return new GuestSessionProfile(this); | 817 return new GuestSessionProfile(this); |
| 822 #endif | 818 #endif |
| 823 return new OffTheRecordProfileImpl(this); | 819 return new OffTheRecordProfileImpl(this); |
| 824 } | 820 } |
| OLD | NEW |