| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 3df9f7707f0abfac0d5f6c40f5356dea06f2b9c4..dce38361bd8448edc4a05bb18cc434bc9c975b45 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -77,8 +77,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"
|
| @@ -492,7 +493,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()));
|
| }
|
|
|