summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:57:58 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:57:58 +0000
commit2f2a8e4bf18a837dbb8c786402bdafbb859ff78a (patch)
treeb7627791bf03722691377ba416a951d9d612ea21 /chrome/browser
parent71f381a8807aa40b5076d51f091528dac467ea09 (diff)
downloadchromium_src-2f2a8e4bf18a837dbb8c786402bdafbb859ff78a.zip
chromium_src-2f2a8e4bf18a837dbb8c786402bdafbb859ff78a.tar.gz
chromium_src-2f2a8e4bf18a837dbb8c786402bdafbb859ff78a.tar.bz2
Fix presentation of infobar for non-warning messages. Their colour is
currently yellow, but should be blue like other non-warning messages. The bug mentions 3 infobars: save passwords, did you mean..., and always restore. However, save passwords is already the correct colour, so I only needed to fix the two others. BUG=9037 TEST=Force the display of the corresponding infobar and look at the colour. Review URL: http://codereview.chromium.org/6312188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/alternate_nav_url_fetcher.cc4
-rw-r--r--chrome/browser/alternate_nav_url_fetcher.h1
-rw-r--r--chrome/browser/ui/browser_init.cc5
3 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 7ebbb00..b143c6a 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -103,6 +103,10 @@ SkBitmap* AlternateNavURLFetcher::GetIcon() const {
IDR_INFOBAR_ALT_NAV_URL);
}
+InfoBarDelegate::Type AlternateNavURLFetcher::GetInfoBarType() const {
+ return PAGE_ACTION_TYPE;
+}
+
string16 AlternateNavURLFetcher::GetMessageTextWithOffset(
size_t* link_offset) const {
const string16 label = l10n_util::GetStringFUTF16(
diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h
index 1964b29..0dbcfb8 100644
--- a/chrome/browser/alternate_nav_url_fetcher.h
+++ b/chrome/browser/alternate_nav_url_fetcher.h
@@ -59,6 +59,7 @@ class AlternateNavURLFetcher : public NotificationObserver,
// LinkInfoBarDelegate
virtual SkBitmap* GetIcon() const;
+ virtual Type GetInfoBarType() const;
virtual string16 GetMessageTextWithOffset(size_t* link_offset) const;
virtual string16 GetLinkText() const;
virtual bool LinkClicked(WindowOpenDisposition disposition);
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index f062f37..41a7ada 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -305,6 +305,7 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
// 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;
@@ -334,6 +335,10 @@ 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);
}