chrome/browser/history/history_service_factory.h - Issue 12330073: Disable ProfileKeyedServices on import process by default.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/history/history_service_factory.h

Issue 12330073: Disable ProfileKeyedServices on import process by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to ToT Created 7 years, 9 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

« chrome/browser/extensions/extension_system_factory.cc ('K') | « chrome/browser/extensions/extension_system_factory.cc ('k') | chrome/browser/history/history_service_factory.cc » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_	5 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_

6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_	6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_

7	7

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/profiles/profile_keyed_service_factory.h"	10 #include "chrome/browser/profiles/profile_keyed_service_factory.h"

(...skipping 25 matching lines...) Expand all Loading...
36 friend struct DefaultSingletonTraits<HistoryServiceFactory>;	36 friend struct DefaultSingletonTraits<HistoryServiceFactory>;

37	37

38 HistoryServiceFactory();	38 HistoryServiceFactory();

39 virtual ~HistoryServiceFactory();	39 virtual ~HistoryServiceFactory();

40	40

41 // ProfileKeyedServiceFactory:	41 // ProfileKeyedServiceFactory:

42 virtual ProfileKeyedService* BuildServiceInstanceFor(	42 virtual ProfileKeyedService* BuildServiceInstanceFor(

43 Profile* profile) const OVERRIDE;	43 Profile* profile) const OVERRIDE;

44 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;	44 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;

45 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;	45 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;

	46 virtual bool ServiceIsNULLOnImportProcess() const OVERRIDE;

46 };	47 };

47	48

48 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_	49 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_

OLD	NEW