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

Unified Diff: chrome/browser/ui/webui/favicon_source.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 4a1b3c0916c665a6386c3e0f00e563e957b58ba8..6fa19b982547b19246e354b75f30310571128f2b 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -12,6 +12,7 @@
#include "grit/locale_settings.h"
#include "grit/ui_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
FaviconSource::FaviconSource(Profile* profile, IconType type)
@@ -96,7 +97,8 @@ void FaviconSource::StartDataRequest(const std::string& path,
request_size_map_.erase(request_id);
SendResponse(request_id,
ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
- history::kPrepopulatedPages[i].favicon_id));
+ history::kPrepopulatedPages[i].favicon_id,
+ ui::SCALE_FACTOR_100P));
return;
}
}
@@ -148,14 +150,14 @@ void FaviconSource::SendDefaultResponse(int request_id) {
if (!default_favicon_large_.get()) {
default_favicon_large_ =
ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
- IDR_DEFAULT_LARGE_FAVICON);
+ IDR_DEFAULT_LARGE_FAVICON, ui::SCALE_FACTOR_100P);
}
bytes = default_favicon_large_;
} else {
if (!default_favicon_.get()) {
default_favicon_ =
ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
- IDR_DEFAULT_FAVICON);
+ IDR_DEFAULT_FAVICON, ui::SCALE_FACTOR_100P);
}
bytes = default_favicon_;
}

Powered by Google App Engine
This is Rietveld 408576698