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