Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Relanding original CL 137734, http://codereview.chromium.org/10387010/.

TBR=aa,abodenha,ben,sail,tony

BUG=123611
TEST=All try bots pass and aura runs without errors.

Review URL: https://chromiumcodereview.appspot.com/10412004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 4a1b3c0..6fa19b9 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_;
   }