Move some win specific code to resource_bundle_win.cc.

Review URL: http://codereview.chromium.org/6902209

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

2 files changed, 6 insertions, 8 deletions

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 306a61e..50ad59a 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -146,14 +146,6 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {
   return *GetEmptyImage();
 }
 
-#if !defined(OS_MACOSX) && !defined(OS_LINUX)
-// Only Mac and Linux have non-Skia native image types. All other platforms use
-// Skia natively, so just use GetImageNamed().
-gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
-  return GetImageNamed(resource_id);
-}
-#endif
-
 RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
     int resource_id) const {
   RefCountedStaticMemory* bytes =
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 9df6b0f..c459026 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -172,4 +172,10 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
   return string16(image->achString, image->nLength);
 }
 
+// Windows only uses SkBitmap for gfx::Image, so this is the same as
+// GetImageNamed.
+gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
+  return GetImageNamed(resource_id);
+}
+
 }  // namespace ui;