| Index: chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
|
| 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 9398bf88d98630f8acbd0bbe4e22e40ad497bfe6..e4f0b4ea689f3aafbefc25e8f87de805d1c4e351 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();
|
| }
|
|
|
|
|