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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/shell/layout_test_controller_bindings.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
« chrome/browser/extensions/extension_protocols.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | content/shell/shell_content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/layout_test_controller_bindings.cc
diff --git a/content/shell/layout_test_controller_bindings.cc b/content/shell/layout_test_controller_bindings.cc
index 2f3a5ad5c276b084f32b2d978d3f72cb94b4662c..054b4f7adc3bbd02b632ef77fd6124a68db56529 100644
--- a/content/shell/layout_test_controller_bindings.cc
+++ b/content/shell/layout_test_controller_bindings.cc
@@ -10,6 +10,7 @@
#include "grit/shell_resources.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using WebKit::WebFrame;
@@ -20,7 +21,8 @@ namespace content {
namespace {
base::StringPiece GetStringResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, ui::SCALE_FACTOR_NONE);
}
RenderView* GetCurrentRenderView() {
« chrome/browser/extensions/extension_protocols.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | content/shell/shell_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698