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

Side by Side Diff: chrome/browser/extensions/activity_log.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_EXTENSIONS_ACTIVITY_LOG_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
6 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_ 6 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 friend struct DefaultSingletonTraits<ActivityLogFactory>; 217 friend struct DefaultSingletonTraits<ActivityLogFactory>;
218 ActivityLogFactory() 218 ActivityLogFactory()
219 : ProfileKeyedServiceFactory("ActivityLog", 219 : ProfileKeyedServiceFactory("ActivityLog",
220 ProfileDependencyManager::GetInstance()) {} 220 ProfileDependencyManager::GetInstance()) {}
221 virtual ~ActivityLogFactory() {} 221 virtual ~ActivityLogFactory() {}
222 222
223 virtual ProfileKeyedService* BuildServiceInstanceFor( 223 virtual ProfileKeyedService* BuildServiceInstanceFor(
224 Profile* profile) const OVERRIDE; 224 Profile* profile) const OVERRIDE;
225 225
226 virtual bool ServiceRedirectedInIncognito() const OVERRIDE; 226 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
227 virtual bool ServiceIsNULLOnImportProcess() const OVERRIDE;
227 228
228 DISALLOW_COPY_AND_ASSIGN(ActivityLogFactory); 229 DISALLOW_COPY_AND_ASSIGN(ActivityLogFactory);
229 }; 230 };
230 231
231 232
232 } // namespace extensions 233 } // namespace extensions
233 234
234 #endif // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_ 235 #endif // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698