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

Unified Diff: chrome/renderer/extensions/json_schema_unittest.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. 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/renderer/extensions/json_schema_unittest.cc
diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc
index c4b06147e107988d79f1be5a83a45ee4cdd7a5e6..59eaa2634ed1beafe039e7d673f0649f62a7d120 100644
--- a/chrome/renderer/extensions/json_schema_unittest.cc
+++ b/chrome/renderer/extensions/json_schema_unittest.cc
@@ -10,6 +10,7 @@
#include "grit/renderer_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
static const char kJsonSchema[] = "json_schema.js";
static const char kJsonSchemaTest[] = "json_schema_test.js";
@@ -23,7 +24,7 @@ class JsonSchemaTest : public V8UnitTest {
// Add the json schema code to the context.
std::string code = ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_JSON_SCHEMA_JS).as_string();
+ IDR_JSON_SCHEMA_JS, ui::ResourceHandle::kScaleFactorNone).as_string();
// json_schema.js expects to have requireNative() defined.
ExecuteScriptInContext(

Powered by Google App Engine
This is Rietveld 408576698