Update the sadtab and throbbers to use the helpers for fetching strings/images from pak file.

Use the images directly from the pak files instead of having extra copies in the bundle.

TEST=sad tab page still works and has all images.  throbbers still work.  the app should no longer carry the sadtab and throbber images directly.
BUG=20230
BUG=21076
Review URL: http://codereview.chromium.org/194101

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

2 files changed, 16 insertions, 10 deletions

diff --git a/chrome/browser/cocoa/sad_tab_view.mm b/chrome/browser/cocoa/sad_tab_view.mm
index a6ae4a9..1143025 100644
--- a/chrome/browser/cocoa/sad_tab_view.mm
+++ b/chrome/browser/cocoa/sad_tab_view.mm
@@ -4,10 +4,11 @@
 
 #include "chrome/browser/cocoa/sad_tab_view.h"
 
-#include "app/l10n_util.h"
+#include "app/l10n_util_mac.h"
+#include "app/resource_bundle.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/cocoa/nsimage_cache.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 static const int kSadTabOffset = -64;
 static const int kIconTitleSpacing = 20;
@@ -16,11 +17,11 @@ static const int kTitleMessageSpacing = 15;
 @implementation SadTabView
 
 - (void)drawRect:(NSRect)dirtyRect {
-  NSImage* sadTabImage = nsimage_cache::ImageNamed(@"sadtab.png");
-  NSString* title =
-      base::SysWideToNSString(l10n_util::GetString(IDS_SAD_TAB_TITLE));
-  NSString* message =
-      base::SysWideToNSString(l10n_util::GetString(IDS_SAD_TAB_MESSAGE));
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  NSImage* sadTabImage = rb.GetNSImageNamed(IDR_SAD_TAB);
+  DCHECK(sadTabImage);
+  NSString* title = l10n_util::GetNSStringWithFixup(IDS_SAD_TAB_TITLE);
+  NSString* message = l10n_util::GetNSStringWithFixup(IDS_SAD_TAB_MESSAGE);
 
   NSColor* textColor = [NSColor whiteColor];
   NSColor* backgroundColor = [NSColor colorWithCalibratedRed:(35.0f/255.0f)
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 0a2c79b..8c47c8e 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -5,6 +5,7 @@
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #include "app/l10n_util.h"
+#include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ -28,6 +29,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 
@@ -672,11 +674,14 @@ static const float kIndentLeavingSpaceForControls = 64.0;
     return;
 
   static NSImage* throbberWaitingImage =
-      [nsimage_cache::ImageNamed(@"throbber_waiting.png") retain];
+      [ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_THROBBER_WAITING)
+        retain];
   static NSImage* throbberLoadingImage =
-      [nsimage_cache::ImageNamed(@"throbber.png") retain];
+      [ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_THROBBER)
+        retain];
   static NSImage* sadFaviconImage =
-      [nsimage_cache::ImageNamed(@"sadfavicon.png") retain];
+      [ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_SAD_FAVICON)
+        retain];
 
   TabController* tabController = [tabArray_ objectAtIndex:index];