diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /chrome/renderer/chrome_content_renderer_client.cc | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.cc')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index aef61cd..ca2626c 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -18,11 +18,11 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/external_ipc_fuzzer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_set.h" +#include "chrome/common/external_ipc_fuzzer.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" @@ -83,6 +83,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/ppapi/plugin_module.h" @@ -668,7 +669,8 @@ void ChromeContentRendererClient::GetNavigationErrorStrings( } const base::StringPiece template_html( - ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); + ResourceBundle::GetSharedInstance().GetRawDataResource( + resource_id, ui::SCALE_FACTOR_NONE)); if (template_html.empty()) { NOTREACHED() << "unable to load template. ID: " << resource_id; } else { |