diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:52:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:52:25 +0000 |
| commit | 3ac5867cfe9d931a65d56a6f39992a0809071d88 (patch) | |
| tree | 95eee19b20c7eba74db2c52372da881049017145 /content/shell/webkit_test_runner_bindings.cc | |
| parent | 89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (diff) | |
| download | chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.zip chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.tar.gz chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.tar.bz2 | |
Revert r165444 "Add method to load resources without scale"
TBR=oshima@chromium.org
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11360041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_runner_bindings.cc')
| -rw-r--r-- | content/shell/webkit_test_runner_bindings.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/webkit_test_runner_bindings.cc b/content/shell/webkit_test_runner_bindings.cc index 0338124..6d1eb6f 100644 --- a/content/shell/webkit_test_runner_bindings.cc +++ b/content/shell/webkit_test_runner_bindings.cc @@ -11,6 +11,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerInfo.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using WebKit::WebFrame; @@ -23,7 +24,7 @@ namespace { base::StringPiece GetStringResource(int resource_id) { return ResourceBundle::GetSharedInstance().GetRawDataResource( - resource_id); + resource_id, ui::SCALE_FACTOR_NONE); } RenderView* GetCurrentRenderView() { |