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

Side by Side Diff: chrome/browser/bookmarks/bookmark_model_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
OLDNEW
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_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/profiles/profile_keyed_service_factory.h" 10 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
(...skipping 19 matching lines...) Expand all
30 30
31 BookmarkModelFactory(); 31 BookmarkModelFactory();
32 virtual ~BookmarkModelFactory(); 32 virtual ~BookmarkModelFactory();
33 33
34 // ProfileKeyedServiceFactory: 34 // ProfileKeyedServiceFactory:
35 virtual ProfileKeyedService* BuildServiceInstanceFor( 35 virtual ProfileKeyedService* BuildServiceInstanceFor(
36 Profile* profile) const OVERRIDE; 36 Profile* profile) const OVERRIDE;
37 virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE; 37 virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;
38 virtual bool ServiceRedirectedInIncognito() const OVERRIDE; 38 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
39 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 39 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
40 virtual bool ServiceIsNULLOnImportProcess() const OVERRIDE;
40 41
41 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory); 42 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory);
42 }; 43 };
43 44
44 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 45 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698