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

chrome/browser/ui/webui/options2/options_ui2.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/options_ui2.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 39 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/options2_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/escape.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
@@ skipping 72 matching lines @@
 
   if (path == kLocalizedStringsFile) {
     // Return dynamically-generated strings from memory.
     jstemplate_builder::UseVersion2 version;
     std::string strings_js;
     jstemplate_builder::AppendJsonJS(localized_strings_.get(), &strings_js);
     response_bytes = base::RefCountedString::TakeString(&strings_js);
   } else if (path == kOptionsBundleJsFile) {
     // Return (and cache) the options javascript code.
     response_bytes = ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-        IDR_OPTIONS2_BUNDLE_JS);
+        IDR_OPTIONS2_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
   } else {
     // Return (and cache) the main options html page as the default.
     response_bytes = ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-        IDR_OPTIONS2_HTML);
+        IDR_OPTIONS2_HTML, ui::SCALE_FACTOR_NONE);
   }
 
   SendResponse(request_id, response_bytes);
 }
 
 std::string OptionsUIHTMLSource::GetMimeType(const std::string& path) const {
   if (path == kLocalizedStringsFile || path == kOptionsBundleJsFile)
     return "application/javascript";
 
   return "text/html";
@@ skipping 181 matching lines @@
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions->Append(entry);
   }
 }
 
 // static
 base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
+      LoadDataResourceBytes(IDR_SETTINGS_FAVICON,
+                            ui::SCALE_FACTOR_100P);
 }
 
 void OptionsUI::InitializeHandlers() {
   Profile* profile = Profile::FromWebUI(web_ui());
   DCHECK(!profile->IsOffTheRecord() || Profile::IsGuestSession());
 
   // A new web page DOM has been brought up in an existing renderer, causing
   // this method to be called twice. If that happens, ignore the second call.
   if (!initialized_handlers_) {
     for (size_t i = 0; i < handlers_.size(); ++i)
@@ skipping 22 matching lines @@
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     // Add handler to the list and also pass the ownership.
     web_ui()->AddMessageHandler(handler.release());
     handler_raw->GetLocalizedValues(localized_strings);
     handlers_.push_back(handler_raw);
   }
 }
 
 }  // namespace options2