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

chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"
 
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/ui_resources.h"
 #include "net/base/mime_util.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace chromeos {
 namespace options2 {
 
 namespace {
 
 const char kDefaultWallpaperPrefix[] = "default_";
 const char kCustomWallpaperPrefix[] = "custom_";
@@ skipping 68 matching lines @@
       gfx::PNGCodec::EncodeBGRASkBitmap(user->wallpaper_thumbnail(),
                                         false, &data);
       SendResponse(request_id, new base::RefCountedBytes(data));
       return;
     }
   }
   int idr = PathToIDR(path);
   if (idr != -1) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    SendResponse(request_id, rb.LoadDataResourceBytes(idr));
+    SendResponse(request_id, rb.LoadDataResourceBytes(idr,
+        ui::SCALE_FACTOR_100P));
   }
 }
 
 std::string WallpaperThumbnailSource::GetMimeType(const std::string&) const {
   return "images/png";
 }
 
 }  // namespace options2
 }  // namespace chromeos