diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 04:04:26 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 04:04:26 +0000 |
commit | 5effdcf0b8d9f252f7644b922da91b3dd2d8c390 (patch) | |
tree | f848578a39097b583299b9b097f2bf41b6e433b1 | |
parent | aab6916887fca00a37ea6b2c3644398337cdbd3a (diff) | |
download | chromium_src-5effdcf0b8d9f252f7644b922da91b3dd2d8c390.zip chromium_src-5effdcf0b8d9f252f7644b922da91b3dd2d8c390.tar.gz chromium_src-5effdcf0b8d9f252f7644b922da91b3dd2d8c390.tar.bz2 |
Chrome crashed infobar should be alert yellow.
- No need to override the GetInfoBarType, because it's WARNING_TYPE by default which give us the yellow color.
- While I'm here add OVERRIDE to some methods.
BUG=75082
TEST=see bug.
R=atwilson@chromium.org
Review URL: http://codereview.chromium.org/6682017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77919 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/browser_init.cc | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 3d775c8..5497b2a 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -6,6 +6,7 @@ #include <algorithm> // For max(). +#include "base/compiler_specific.h" #include "base/environment.h" #include "base/event_recorder.h" #include "base/file_path.h" @@ -141,14 +142,14 @@ class DefaultBrowserInfoBarDelegate : public ConfirmInfoBarDelegate { // ConfirmInfoBarDelegate: virtual bool ShouldExpire( - const NavigationController::LoadCommittedDetails& details) const; - virtual void InfoBarClosed(); - virtual SkBitmap* GetIcon() const; - virtual string16 GetMessageText() const; - virtual string16 GetButtonLabel(InfoBarButton button) const; - virtual bool NeedElevation(InfoBarButton button) const; - virtual bool Accept(); - virtual bool Cancel(); + const NavigationController::LoadCommittedDetails& details) const OVERRIDE; + virtual void InfoBarClosed() OVERRIDE; + virtual SkBitmap* GetIcon() const OVERRIDE; + virtual string16 GetMessageText() const OVERRIDE; + virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; + virtual bool NeedElevation(InfoBarButton button) const OVERRIDE; + virtual bool Accept() OVERRIDE; + virtual bool Cancel() OVERRIDE; // The Profile that we restore sessions from. Profile* profile_; @@ -305,13 +306,12 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~SessionCrashedInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual void InfoBarClosed(); - virtual SkBitmap* GetIcon() const; - virtual Type GetInfoBarType() const; - virtual string16 GetMessageText() const; - virtual int GetButtons() const; - virtual string16 GetButtonLabel(InfoBarButton button) const; - virtual bool Accept(); + virtual void InfoBarClosed() OVERRIDE; + virtual SkBitmap* GetIcon() const OVERRIDE; + virtual string16 GetMessageText() const OVERRIDE; + virtual int GetButtons() const OVERRIDE; + virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; + virtual bool Accept() OVERRIDE; // The Profile that we restore sessions from. Profile* profile_; @@ -337,10 +337,6 @@ SkBitmap* SessionCrashedInfoBarDelegate::GetIcon() const { IDR_INFOBAR_RESTORE_SESSION); } -InfoBarDelegate::Type SessionCrashedInfoBarDelegate::GetInfoBarType() const { - return PAGE_ACTION_TYPE; -} - string16 SessionCrashedInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE); } |