summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/module_system_test.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:05:40 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:05:40 +0000
commitbebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f (patch)
tree2858dc6858da0f4c70b7d4fa2d11ba02ca83fde6 /chrome/test/base/module_system_test.cc
parentc145c83565c8c019f97d0280d12c623352e1c58e (diff)
downloadchromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.zip
chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.gz
chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.bz2
Select theme resources from ResourceBundle at requested scale factor.
Return the best match for a requested scale factor when fetching raw image data from ResourceBundle. TBR=aa,abodenha BUG=123611 TEST=ResourceBundle.LoadImageResourceBytes Review URL: https://chromiumcodereview.appspot.com/10387010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/module_system_test.cc')
-rw-r--r--chrome/test/base/module_system_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc
index ce77a20..d6bb6d3 100644
--- a/chrome/test/base/module_system_test.cc
+++ b/chrome/test/base/module_system_test.cc
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_piece.h"
#include "chrome/renderer/native_handler.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include <map>
@@ -98,7 +99,8 @@ void ModuleSystemTest::RegisterModule(const std::string& name,
void ModuleSystemTest::RegisterModule(const std::string& name,
int resource_id) {
const std::string& code = ResourceBundle::GetSharedInstance().
- GetRawDataResource(resource_id).as_string();
+ GetRawDataResource(resource_id,
+ ui::SCALE_FACTOR_NONE).as_string();
source_map_->RegisterModule(name, code);
}