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.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165444

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

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

5 files changed, 39 insertions, 20 deletions

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 7582b24..db6cb55 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -391,6 +391,11 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
 }
 
 base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
+    int resource_id) const {
+  return LoadDataResourceBytesForScale(resource_id, ui::SCALE_FACTOR_NONE);
+}
+
+base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytesForScale(
     int resource_id,
     ScaleFactor scale_factor) const {
   base::RefCountedStaticMemory* bytes = NULL;
@@ -398,7 +403,8 @@ base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
     bytes = delegate_->LoadDataResourceBytes(resource_id, scale_factor);
 
   if (!bytes) {
-    base::StringPiece data = GetRawDataResource(resource_id, scale_factor);
+    base::StringPiece data =
+        GetRawDataResourceForScale(resource_id, scale_factor);
     if (!data.empty()) {
       bytes = new base::RefCountedStaticMemory(
           reinterpret_cast<const unsigned char*>(data.data()), data.length());
@@ -408,7 +414,11 @@ base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
   return bytes;
 }
 
-base::StringPiece ResourceBundle::GetRawDataResource(
+base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const {
+  return GetRawDataResourceForScale(resource_id, ui::SCALE_FACTOR_NONE);
+}
+
+base::StringPiece ResourceBundle::GetRawDataResourceForScale(
     int resource_id,
     ScaleFactor scale_factor) const {
   base::StringPiece data;
@@ -452,7 +462,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
   if (!locale_resources_data_->GetStringPiece(message_id, &data)) {
     // Fall back on the main data pack (shouldn't be any strings here except in
     // unittests).
-    data = GetRawDataResource(message_id, ui::SCALE_FACTOR_NONE);
+    data = GetRawDataResource(message_id);
     if (data.empty()) {
       NOTREACHED() << "unable to find resource: " << message_id;
       return string16();
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index d13b8cc..49657a1 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -201,19 +201,28 @@ class UI_EXPORT ResourceBundle {
   // Same as GetNativeImageNamed() except that RTL is not enabled.
   gfx::Image& GetNativeImageNamed(int resource_id);
 
+  // Loads the raw bytes of a scale independent data resource.
+  base::RefCountedStaticMemory* LoadDataResourceBytes(int resource_id) const;
+
   // Loads the raw bytes of a data resource nearest the scale factor
-  // |scale_factor| into |bytes|, without doing any processing or interpretation
-  // of the resource. Use ResourceHandle::SCALE_FACTOR_NONE for non-image
-  // resources. Returns NULL if we fail to read the resource.
-  base::RefCountedStaticMemory* LoadDataResourceBytes(
+  // |scale_factor| into |bytes|, without doing any processing or
+  // interpretation of the resource. Use ResourceHandle::SCALE_FACTOR_NONE
+  // for scale independent image resources (such as wallpaper).
+  // Returns NULL if we fail to read the resource.
+  base::RefCountedStaticMemory* LoadDataResourceBytesForScale(
       int resource_id,
       ScaleFactor scale_factor) const;
 
+  // Return the contents of a scale independent resource in a
+  // StringPiece given the resource id
+  base::StringPiece GetRawDataResource(int resource_id) const;
+
   // Return the contents of a resource in a StringPiece given the resource id
   // nearest the scale factor |scale_factor|.
-  // Use ResourceHanlde::SCALE_FACTOR_NONE for non-image resources.
-  base::StringPiece GetRawDataResource(int resource_id,
-                                       ScaleFactor scale_factor) const;
+  // Use ResourceHanlde::SCALE_FACTOR_NONE for scale independent image resources
+  // (such as wallpaper).
+  base::StringPiece GetRawDataResourceForScale(int resource_id,
+                                               ScaleFactor scale_factor) const;
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index 1d5d1e3..7040f9e 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -89,7 +89,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
 
   if (image.IsEmpty()) {
     scoped_refptr<base::RefCountedStaticMemory> data(
-        LoadDataResourceBytes(resource_id, SCALE_FACTOR_100P));
+        LoadDataResourceBytesForScale(resource_id, SCALE_FACTOR_100P));
     GdkPixbuf* pixbuf = LoadPixbuf(data.get(), rtl == RTL_ENABLED);
 
     if (!pixbuf) {
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
index 6ddc38b..06da17d 100644
--- a/ui/base/resource/resource_bundle_ios.mm
+++ b/ui/base/resource/resource_bundle_ios.mm
@@ -113,7 +113,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
     ui::ScaleFactor scale_factor = supported_scale_factors[0];
 
     scoped_refptr<base::RefCountedStaticMemory> data(
-        LoadDataResourceBytes(resource_id, scale_factor));
+        LoadDataResourceBytesForScale(resource_id, scale_factor));
 
     // Create a data object from the raw bytes.
     scoped_nsobject<NSData> ns_data(
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index df3a369..eadfd9e 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -187,7 +187,7 @@ TEST(ResourceBundle, DelegateLoadDataResourceBytes) {
       .WillOnce(Return(static_memory));
 
   scoped_refptr<base::RefCountedStaticMemory> result =
-      resource_bundle.LoadDataResourceBytes(resource_id, scale_factor);
+      resource_bundle.LoadDataResourceBytesForScale(resource_id, scale_factor);
   EXPECT_EQ(static_memory, result);
 }
 
@@ -207,7 +207,7 @@ TEST(ResourceBundle, DelegateGetRawDataResource) {
       .WillOnce(Return(string_piece));
 
   base::StringPiece result = resource_bundle.GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE);
+      resource_id);
   EXPECT_EQ(string_piece.data(), result.data());
 }
 
@@ -267,14 +267,14 @@ TEST(ResourceBundle, LoadDataResourceBytes) {
 
     const int kUnfoundResourceId = 10000;
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
+        kUnfoundResourceId));
 
     // Give a .pak file that doesn't exist so we will fail to load it.
     resource_bundle.AddDataPackFromPath(
         FilePath(FILE_PATH_LITERAL("non-existant-file.pak")),
         ui::SCALE_FACTOR_NONE);
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
+        kUnfoundResourceId));
   }
 }
 
@@ -304,16 +304,16 @@ TEST(ResourceBundle, GetRawDataResource) {
 
     // Resource ID 4 exists in both 1x and 2x paks, so we expect a different
     // result when requesting the 2x scale.
-    EXPECT_EQ("this is id 4", resource_bundle.GetRawDataResource(4,
+    EXPECT_EQ("this is id 4", resource_bundle.GetRawDataResourceForScale(4,
         SCALE_FACTOR_100P));
-    EXPECT_EQ("this is id 4 2x", resource_bundle.GetRawDataResource(4,
+    EXPECT_EQ("this is id 4 2x", resource_bundle.GetRawDataResourceForScale(4,
         SCALE_FACTOR_200P));
 
     // Resource ID 6 only exists in the 1x pak so we expect the same resource
     // for both scale factor requests.
-    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
+    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResourceForScale(6,
         SCALE_FACTOR_100P));
-    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
+    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResourceForScale(6,
         SCALE_FACTOR_200P));
   }
 }