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

Unified Diff: chrome/browser/extensions/extension_web_ui.cc

Issue 11418021: Revert 168079 - This CL ensures that favicons always (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_uninstall_dialog.cc ('k') | chrome/browser/favicon/favicon_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_web_ui.cc
===================================================================
--- chrome/browser/extensions/extension_web_ui.cc (revision 168086)
+++ chrome/browser/extensions/extension_web_ui.cc (working copy)
@@ -14,7 +14,6 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/image_loading_tracker.h"
-#include "chrome/browser/favicon/favicon_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
@@ -99,12 +98,11 @@
void Init() {
if (extension_) {
// Fetch resources for all supported scale factors for which there are
- // resources. Load image reps for all supported scale factors (in
- // addition to 1x) immediately instead of in an as needed fashion to be
- // consistent with how favicons are requested for chrome:// and page
- // URLs.
+ // resources. Load image reps for all supported scale factors immediately
+ // instead of in an as needed fashion to be consistent with how favicons
+ // are requested for chrome:// and page URLs.
const std::vector<ui::ScaleFactor>& scale_factors =
- FaviconUtil::GetFaviconScaleFactors();
+ ui::GetSupportedScaleFactors();
std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
for (size_t i = 0; i < scale_factors.size(); ++i) {
float scale = ui::GetScaleFactorScale(scale_factors[i]);
« no previous file with comments | « chrome/browser/extensions/extension_uninstall_dialog.cc ('k') | chrome/browser/favicon/favicon_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698