Revert r165444 "Add method to load resources without scale"

TBR=oshima@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/11360041

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

1 files changed, 9 insertions, 4 deletions

diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
index 9398bf8..e4f0b4e 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
@@ -17,6 +17,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"
 
 // Define the values of standard URLs.
@@ -67,7 +68,8 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "sharingexplain", IDS_CLOUD_PRINT_SETUP_SHARING_EXPLAIN);
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML,
+                            ui::SCALE_FACTOR_NONE));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintGaiaLoginPath) {
@@ -103,7 +105,8 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL);
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
+        .GetRawDataResource(IDR_GAIA_LOGIN_HTML,
+                            ui::SCALE_FACTOR_NONE));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupDonePath) {
@@ -111,13 +114,15 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "success", IDS_SYNC_SUCCESS);
     AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL);
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML,
+                            ui::SCALE_FACTOR_NONE));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupFlowPath) {
     static const base::StringPiece html(
         ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML,
+                            ui::SCALE_FACTOR_NONE));
     response = html.as_string();
   }