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

Side by Side Diff: chrome/browser/favicon/favicon_service_factory.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 #include "chrome/browser/favicon/favicon_service_factory.h" 5 #include "chrome/browser/favicon/favicon_service_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/favicon/favicon_service.h" 9 #include "chrome/browser/favicon/favicon_service.h"
9 #include "chrome/browser/history/history_service.h" 10 #include "chrome/browser/history/history_service.h"
10 #include "chrome/browser/history/history_service_factory.h" 11 #include "chrome/browser/history/history_service_factory.h"
11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 14
15 // static 15 // static
16 FaviconService* FaviconServiceFactory::GetForProfile( 16 FaviconService* FaviconServiceFactory::GetForProfile(
17 Profile* profile, Profile::ServiceAccessType sat) { 17 Profile* profile, Profile::ServiceAccessType sat) {
18 if (!profile->IsOffTheRecord()) { 18 if (!profile->IsOffTheRecord()) {
19 return static_cast<FaviconService*>( 19 return static_cast<FaviconService*>(
20 GetInstance()->GetServiceForProfile(profile, true)); 20 GetInstance()->GetServiceForProfile(profile, true));
21 } else if (sat == Profile::EXPLICIT_ACCESS) { 21 } else if (sat == Profile::EXPLICIT_ACCESS) {
(...skipping 24 matching lines...) Expand all
46 ProfileKeyedService* FaviconServiceFactory::BuildServiceInstanceFor( 46 ProfileKeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
47 Profile* profile) const { 47 Profile* profile) const {
48 HistoryService* history_service = HistoryServiceFactory::GetForProfile( 48 HistoryService* history_service = HistoryServiceFactory::GetForProfile(
49 profile, Profile::EXPLICIT_ACCESS); 49 profile, Profile::EXPLICIT_ACCESS);
50 return new FaviconService(history_service); 50 return new FaviconService(history_service);
51 } 51 }
52 52
53 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { 53 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
54 return true; 54 return true;
55 } 55 }
OLDNEW
« no previous file with comments | « chrome/browser/external_protocol/external_protocol_handler.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698