Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 7068025: Revert 86724 - Modifying the BackgroundModeManager to handle multiple profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
297 virtual UserScriptMaster* GetUserScriptMaster() { 301 virtual UserScriptMaster* GetUserScriptMaster() {
298 return GetOriginalProfile()->GetUserScriptMaster(); 302 return GetOriginalProfile()->GetUserScriptMaster();
299 } 303 }
300 304
301 virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() { 305 virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() {
302 // TODO(mpcomplete): figure out whether we should return the original 306 // TODO(mpcomplete): figure out whether we should return the original
303 // profile's version. 307 // profile's version.
304 return NULL; 308 return NULL;
305 } 309 }
306 310
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 }; 815 };
812 #endif 816 #endif
813 817
814 Profile* Profile::CreateOffTheRecordProfile() { 818 Profile* Profile::CreateOffTheRecordProfile() {
815 #if defined(OS_CHROMEOS) 819 #if defined(OS_CHROMEOS)
816 if (Profile::IsGuestSession()) 820 if (Profile::IsGuestSession())
817 return new GuestSessionProfile(this); 821 return new GuestSessionProfile(this);
818 #endif 822 #endif
819 return new OffTheRecordProfileImpl(this); 823 return new OffTheRecordProfileImpl(this);
820 } 824 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698