From c49201a506dba0e3a04aad623e4b259f948f3159 Mon Sep 17 00:00:00 2001 From: "flackr@chromium.org" Date: Thu, 24 May 2012 11:04:57 +0000 Subject: 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 --- chrome/renderer/extensions/user_script_slave.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/renderer/extensions/user_script_slave.cc') diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 8c346d5..3b4a185 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -8,10 +8,10 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/metrics/histogram.h" #include "base/perftimer.h" #include "base/pickle.h" #include "base/shared_memory.h" -#include "base/metrics/histogram.h" #include "base/stringprintf.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" @@ -27,9 +27,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.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; @@ -119,7 +120,7 @@ UserScriptSlave::UserScriptSlave(const ExtensionSet* extensions) script_deleter_(&scripts_), extensions_(extensions) { api_js_ = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_GREASEMONKEY_API_JS); + IDR_GREASEMONKEY_API_JS, ui::SCALE_FACTOR_NONE); } UserScriptSlave::~UserScriptSlave() {} -- cgit v1.1