Add method to load resources without scale

 This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h

I'll cleanup ContentClient in separate CL.

BUG=156569
TEST=none. no functional change.

Review URL: https://chromiumcodereview.appspot.com/11341003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 10 insertions, 15 deletions

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 2e700d9..dcd558b 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -726,7 +726,7 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
 
     const base::StringPiece template_html(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
-            resource_id, ui::SCALE_FACTOR_NONE));
+            resource_id));
     if (template_html.empty()) {
       NOTREACHED() << "unable to load template. ID: " << resource_id;
     } else {
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index bf2ec59..64a975c 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -860,8 +860,7 @@ void Dispatcher::DidCreateDocumentElement(WebKit::WebFrame* frame) {
     // loaded in each app.
     frame->document().insertUserStyleSheet(
         WebString::fromUTF8(ResourceBundle::GetSharedInstance().
-            GetRawDataResource(IDR_PLATFORM_APP_CSS,
-                               ui::SCALE_FACTOR_NONE)),
+            GetRawDataResource(IDR_PLATFORM_APP_CSS)),
         WebDocument::UserStyleUserLevel);
   }
 }
diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc
index 9aaa459..848d885 100644
--- a/chrome/renderer/extensions/json_schema_unittest.cc
+++ b/chrome/renderer/extensions/json_schema_unittest.cc
@@ -9,7 +9,6 @@
 #include "chrome/test/base/v8_unit_test.h"
 #include "grit/renderer_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 static const char kJsonSchema[] = "json_schema.js";
@@ -26,7 +25,7 @@ class JsonSchemaTest : public V8UnitTest {
 
     // Add the json schema code to the context.
     std::string code = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_JSON_SCHEMA_JS, ui::SCALE_FACTOR_NONE).as_string();
+        IDR_JSON_SCHEMA_JS).as_string();
 
     // json_schema.js expects to have requireNative() defined.
     ExecuteScriptInContext(
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
index 7507ed1..4c6600f 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -31,7 +31,6 @@
 #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 "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using WebKit::WebFrame;
@@ -121,7 +120,7 @@ UserScriptSlave::UserScriptSlave(const ExtensionSet* extensions)
       script_deleter_(&scripts_),
       extensions_(extensions) {
   api_js_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
-                IDR_GREASEMONKEY_API_JS, ui::SCALE_FACTOR_NONE);
+      IDR_GREASEMONKEY_API_JS);
 }
 
 UserScriptSlave::~UserScriptSlave() {}
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index bce80a8..4590a92 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -39,7 +39,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
@@ -107,7 +106,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
     const WebPluginParams& params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_BLOCKED_PLUGIN_HTML));
 
   DictionaryValue values;
   values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING));
@@ -138,7 +137,7 @@ PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin(
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_BLOCKED_PLUGIN_HTML));
   std::string html_data =
       jstemplate_builder::GetI18nTemplateHtml(template_html, &values);
 
@@ -170,7 +169,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin(
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          template_id, ui::SCALE_FACTOR_NONE));
+          template_id));
 
   DCHECK(!template_html.empty()) << "unable to load template. ID: "
                                  << template_id;
@@ -193,7 +192,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMobileYoutubePlugin(
     const WebPluginParams& params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_MOBILE_YOUTUBE_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_MOBILE_YOUTUBE_PLUGIN_HTML));
 
   DictionaryValue values;
   values.SetString("video_id", GetYoutubeVideoId(params));
diff --git a/chrome/renderer/resource_bundle_source_map.cc b/chrome/renderer/resource_bundle_source_map.cc
index 86ee68d..5fab053 100644
--- a/chrome/renderer/resource_bundle_source_map.cc
+++ b/chrome/renderer/resource_bundle_source_map.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/resource_bundle_source_map.h"
 
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ResourceBundleSourceMap::ResourceBundleSourceMap(
@@ -26,7 +25,7 @@ v8::Handle<v8::Value> ResourceBundleSourceMap::GetSource(
     return v8::Undefined();
   int resource_id = resource_id_map_[name];
   return ConvertString(resource_bundle_->GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE));
+      resource_id));
 }
 
 bool ResourceBundleSourceMap::Contains(const std::string& name) {
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index 207ffe9..fda479f 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -730,7 +730,7 @@ bool SearchBoxExtension::PageSupportsInstant(WebKit::WebFrame* frame) {
 v8::Extension* SearchBoxExtension::Get() {
   const base::StringPiece code =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_SEARCHBOX_API, ui::SCALE_FACTOR_NONE);
+          IDR_SEARCHBOX_API);
   return new SearchBoxExtensionWrapper(code);
 }