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

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

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Eliminate Profile::FromBrowserContext in some places Created 4 years, 4 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
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_utils.h" 5 #include "chrome/browser/favicon/favicon_utils.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
8 #include "chrome/browser/favicon/favicon_service_factory.h" 8 #include "chrome/browser/favicon/favicon_service_factory.h"
9 #include "chrome/browser/history/history_service_factory.h" 9 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 10 matching lines...) Expand all
21 return; 21 return;
22 22
23 Profile* original_profile = 23 Profile* original_profile =
24 Profile::FromBrowserContext(web_contents->GetBrowserContext()) 24 Profile::FromBrowserContext(web_contents->GetBrowserContext())
25 ->GetOriginalProfile(); 25 ->GetOriginalProfile();
26 return ContentFaviconDriver::CreateForWebContents( 26 return ContentFaviconDriver::CreateForWebContents(
27 web_contents, FaviconServiceFactory::GetForProfile( 27 web_contents, FaviconServiceFactory::GetForProfile(
28 original_profile, ServiceAccessType::IMPLICIT_ACCESS), 28 original_profile, ServiceAccessType::IMPLICIT_ACCESS),
29 HistoryServiceFactory::GetForProfile(original_profile, 29 HistoryServiceFactory::GetForProfile(original_profile,
30 ServiceAccessType::IMPLICIT_ACCESS), 30 ServiceAccessType::IMPLICIT_ACCESS),
31 BookmarkModelFactory::GetForProfileIfExists(original_profile)); 31 BookmarkModelFactory::GetForBrowserContextIfExists(original_profile));
32 } 32 }
33 33
34 bool ShouldDisplayFavicon(content::WebContents* web_contents) { 34 bool ShouldDisplayFavicon(content::WebContents* web_contents) {
35 // Always display a throbber during pending loads. 35 // Always display a throbber during pending loads.
36 const content::NavigationController& controller = 36 const content::NavigationController& controller =
37 web_contents->GetController(); 37 web_contents->GetController();
38 if (controller.GetLastCommittedEntry() && controller.GetPendingEntry()) 38 if (controller.GetLastCommittedEntry() && controller.GetPendingEntry())
39 return true; 39 return true;
40 40
41 GURL url = web_contents->GetURL(); 41 GURL url = web_contents->GetURL();
42 if (url.SchemeIs(content::kChromeUIScheme) && 42 if (url.SchemeIs(content::kChromeUIScheme) &&
43 url.host_piece() == chrome::kChromeUINewTabHost) { 43 url.host_piece() == chrome::kChromeUINewTabHost) {
44 return false; 44 return false;
45 } 45 }
46 46
47 // No favicon on Instant New Tab Pages. 47 // No favicon on Instant New Tab Pages.
48 if (search::IsInstantNTP(web_contents)) 48 if (search::IsInstantNTP(web_contents))
49 return false; 49 return false;
50 50
51 return true; 51 return true;
52 } 52 }
53 53
54 } // namespace favicon 54 } // namespace favicon
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698