diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 02:00:48 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 02:00:48 +0000 |
| commit | ea405c71d7465336ee14b95276854255f2d619a5 (patch) | |
| tree | 715b683decdf0739122c22e2f09f4687d31fce2f | |
| parent | f469b0a1edadfd68a86fd045490faa4fb352a503 (diff) | |
| download | chromium_src-ea405c71d7465336ee14b95276854255f2d619a5.zip chromium_src-ea405c71d7465336ee14b95276854255f2d619a5.tar.gz chromium_src-ea405c71d7465336ee14b95276854255f2d619a5.tar.bz2 | |
linux: don't crash on alert infobars.
estade didn't sufficiently test his change. Luckily, the fix is trivial.
TBR=estade
Review URL: http://codereview.chromium.org/62138
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13334 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_init.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 183bc9e..07e32d9 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -34,6 +34,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "net/base/cookie_monster.h" #include "webkit/glue/webkit_glue.h" @@ -41,7 +42,6 @@ #if defined(OS_WIN) #include "base/win_util.h" -#include "chrome/common/resource_bundle.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -75,13 +75,8 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate { #endif } virtual SkBitmap* GetIcon() const { -#if defined(OS_WIN) return ResourceBundle::GetSharedInstance().GetBitmapNamed( IDR_INFOBAR_RESTORE_SESSION); -#else - // TODO(port): implement session crashed info bar. - return NULL; -#endif } virtual int GetButtons() const { return BUTTON_OK; } virtual std::wstring GetButtonLabel(InfoBarButton button) const { |