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

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

Issue 674273002: Cleanup: Remove unneeded chrome/common/pref_names.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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
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 "base/prefs/pref_service.h"
9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" 9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
10 #include "chrome/browser/favicon/favicon_service.h" 10 #include "chrome/browser/favicon/favicon_service.h"
11 #include "chrome/browser/history/history_service.h" 11 #include "chrome/browser/history/history_service.h"
12 #include "chrome/browser/history/history_service_factory.h" 12 #include "chrome/browser/history/history_service_factory.h"
13 #include "chrome/common/pref_names.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 14
16 // static 15 // static
17 FaviconService* FaviconServiceFactory::GetForProfile( 16 FaviconService* FaviconServiceFactory::GetForProfile(
18 Profile* profile, Profile::ServiceAccessType sat) { 17 Profile* profile, Profile::ServiceAccessType sat) {
19 if (!profile->IsOffTheRecord()) { 18 if (!profile->IsOffTheRecord()) {
20 return static_cast<FaviconService*>( 19 return static_cast<FaviconService*>(
21 GetInstance()->GetServiceForBrowserContext(profile, true)); 20 GetInstance()->GetServiceForBrowserContext(profile, true));
22 } else if (sat == Profile::EXPLICIT_ACCESS) { 21 } else if (sat == Profile::EXPLICIT_ACCESS) {
23 // Profile must be OffTheRecord in this case. 22 // Profile must be OffTheRecord in this case.
(...skipping 25 matching lines...) Expand all
49 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor( 48 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
50 content::BrowserContext* profile) const { 49 content::BrowserContext* profile) const {
51 FaviconClient* favicon_client = 50 FaviconClient* favicon_client =
52 ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile)); 51 ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile));
53 return new FaviconService(static_cast<Profile*>(profile), favicon_client); 52 return new FaviconService(static_cast<Profile*>(profile), favicon_client);
54 } 53 }
55 54
56 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { 55 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
57 return true; 56 return true;
58 } 57 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698