Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/test/base/module_system_test.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/module_system_test.cc
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc
index ce77a20c2a52a7637c654f3f4ddc1ac1cbd1a754..d6bb6d3ec1a2d70ddc4a5553d8f965f980db4fc6 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);
}

Powered by Google App Engine
This is Rietveld 408576698