diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /content/renderer/render_thread_impl.cc | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.cc')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index fe72093..ca8033e 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -79,8 +79,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "ui/base/layout.h" #include "ui/base/ui_base_switches.h" #include "v8/include/v8.h" #include "webkit/glue/webkit_glue.h" @@ -499,7 +500,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDomAutomationController)) { base::StringPiece extension = content::GetContentClient()->GetDataResource( - IDR_DOM_AUTOMATION_JS); + IDR_DOM_AUTOMATION_JS, ui::SCALE_FACTOR_NONE); RegisterExtension(new v8::Extension( "dom_automation.js", extension.data(), 0, NULL, extension.size())); } |