diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 15:26:20 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 15:26:20 +0000 |
| commit | 77efa55b335a12c49b817223f5abad58b051a693 (patch) | |
| tree | d6e7e42098d9ac0529f3d2d840b9a276e2fdce69 /chrome/browser/cocoa/sad_tab_view.mm | |
| parent | b0ff8e5c76ebc15cdb825f56558f3c3b3cfda837 (diff) | |
| download | chromium_src-77efa55b335a12c49b817223f5abad58b051a693.zip chromium_src-77efa55b335a12c49b817223f5abad58b051a693.tar.gz chromium_src-77efa55b335a12c49b817223f5abad58b051a693.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/cocoa/sad_tab_view.mm')
| -rw-r--r-- | chrome/browser/cocoa/sad_tab_view.mm | 15 |
1 files changed, 8 insertions, 7 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) |