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

chrome/browser/ui/webui/about_ui.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/about_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 47 matching lines @@
 #include "content/public/common/process_type.h"
 #include "crypto/nss_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
+#include "content/public/browser/zygote_host_linux.h"
 #include "content/public/common/sandbox_linux.h"
-#include "content/public/browser/zygote_host_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 152 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(&ChromeOSTermsHandler::ResponseOnUIThread, this));
   }
 
   void ResponseOnUIThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     // If we fail to load Chrome OS EULA from disk, load it from resources.
     // Do nothing if OEM EULA load failed.
     if (contents_.empty() && path_ != chrome::kOemEulaURLPath) {
       contents_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_TERMS_HTML).as_string();
+          IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE).as_string();
     }
     source_->FinishDataRequest(contents_, request_id_);
   }
 
   // Where the results are fed to.
   scoped_refptr<AboutUIHTMLSource> source_;
 
   // Path in the URL.
   std::string path_;
 
@@ skipping 572 matching lines @@
     // The AboutMemoryHandler cleans itself up, but |StartFetch()| will want
     // the refcount to be greater than 0.
     scoped_refptr<AboutMemoryHandler>
         handler(new AboutMemoryHandler(source, request_id));
     // TODO(jamescook): Maybe this shouldn't update UMA?
     handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
   } else {
     source->FinishDataRequest(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             path == kMemoryJsPath ? IDR_ABOUT_MEMORY_JS :
-                IDR_ABOUT_MEMORY_HTML).as_string(), request_id);
+                IDR_ABOUT_MEMORY_HTML,
+            ui::SCALE_FACTOR_NONE).as_string(), request_id);
   }
 }
 
 // Handler for filling in the "about:stats" page, as called by the browser's
 // About handler processing.
 // |query| is roughly the query string of the about:stats URL.
 // Returns a string containing the HTML to render for the about:stats page.
 // Conditional Output:
 //      if |query| is "json", returns a JSON format of all counters.
 //      if |query| is "raw", returns plain text of counter deltas.
@@ skipping 130 matching lines @@
         data.append(name);
         data.append(":");
         data.append(base::IntToString(delta));
         data.append("\n");
       }
     }
     data.append("</pre>");
   } else {
     // Get about_stats.html/js from resource bundle.
     data = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        (query == kStatsJsPath ? IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML)).
-        as_string();
+        (query == kStatsJsPath ? IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML),
+        ui::SCALE_FACTOR_NONE).as_string();
 
     if (query != kStatsJsPath) {
       // Clear the timer list since we stored the data in the timers list
       // as well.
       for (int index = static_cast<int>(timers->GetSize())-1; index >= 0;
            index--) {
         Value* value;
         timers->Remove(index, &value);
         // We don't care about the value pointer; it's still tracked
         // on the counters list.
@@ skipping 74 matching lines @@
 
   AppendFooter(&data);
   return data;
 }
 #endif
 
 std::string AboutVersionStaticContent(const std::string& query) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       query ==  kVersionJsPath ?
       IDR_ABOUT_VERSION_JS :
-      IDR_ABOUT_VERSION_HTML).as_string();
+      IDR_ABOUT_VERSION_HTML, ui::SCALE_FACTOR_NONE).as_string();
 }
 
 std::string AboutVersionStrings(DictionaryValue* localized_strings,
                                 Profile* profile) {
   DCHECK(profile);
   localized_strings->SetString("title",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_TITLE));
   chrome::VersionInfo version_info;
 
   localized_strings->SetString("name",
@@ skipping 280 matching lines @@
                                          bool is_incognito,
                                          int request_id) {
   std::string response;
   std::string host = source_name();
   // Add your data source here, in alphabetical order.
   if (host == chrome::kChromeUIChromeURLsHost) {
     response = ChromeURLs();
   } else if (host == chrome::kChromeUICreditsHost) {
     int idr = (path == kCreditsJsPath) ? IDR_CREDITS_JS : IDR_CREDITS_HTML;
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        idr).as_string();
+        idr, ui::SCALE_FACTOR_NONE).as_string();
 #if defined(OS_CHROMEOS)
   } else if (host == chrome::kChromeUICryptohomeHost) {
     FinishCryptohomeDataRequest(this, path, request_id);
     return;
   } else if (host == chrome::kChromeUIDiscardsHost) {
     response = AboutDiscards(path);
 #endif
 #if defined(USE_ASH)
   } else if (host == chrome::kChromeUITransparencyHost) {
     response = AboutTransparency(path);
@@ skipping 10 matching lines @@
   } else if (host == chrome::kChromeUIMemoryHost) {
     response = GetAboutMemoryRedirectResponse(profile());
   } else if (host == chrome::kChromeUIMemoryRedirectHost) {
     FinishMemoryDataRequest(path, this, request_id);
     return;
 #if defined(OS_CHROMEOS)
   } else if (host == chrome::kChromeUINetworkHost) {
     response = AboutNetwork(path);
   } else if (host == chrome::kChromeUIOSCreditsHost) {
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_OS_CREDITS_HTML).as_string();
+        IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string();
 #endif
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
   } else if (host == chrome::kChromeUISandboxHost) {
     response = AboutSandbox();
 #endif
   } else if (host == chrome::kChromeUIStatsHost) {
     response = AboutStats(path);
   } else if (host == chrome::kChromeUITermsHost) {
 #if defined(OS_CHROMEOS)
     ChromeOSTermsHandler::Start(this, path, request_id);
     return;
 #else
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_TERMS_HTML).as_string();
+        IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE).as_string();
 #endif
   } else if (host == chrome::kChromeUIVersionHost) {
     if (path == kStringsJsPath) {
       // The Flash version information is needed on this page, so make sure
       // the plugins are loaded.
       PluginService::GetInstance()->GetPlugins(
           base::Bind(&HandleAboutVersionStrings,
                      make_scoped_refptr(this), request_id));
       return;
     } else {
@@ skipping 23 matching lines @@
 
 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
     : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::DataSource* source =
       new AboutUIHTMLSource(name, profile);
   if (source) {
     ChromeURLDataManager::AddDataSource(profile, source);
   }
 }