diff options
| author | miguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 09:09:12 +0000 |
|---|---|---|
| committer | miguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 09:09:12 +0000 |
| commit | 277823276af8fb584020b981b30fbde5b4e7171d (patch) | |
| tree | 55f7af4ef205226ff954cfdc7d872388dd8aee6e /chrome/browser/infobars | |
| parent | d60c81a0455c34c6280f9603cba357e840419293 (diff) | |
| download | chromium_src-277823276af8fb584020b981b30fbde5b4e7171d.zip chromium_src-277823276af8fb584020b981b30fbde5b4e7171d.tar.gz chromium_src-277823276af8fb584020b981b30fbde5b4e7171d.tar.bz2 | |
[InfoBar] Enable the infobar classes for Android
BUG=158817
Review URL: https://chromiumcodereview.appspot.com/17465010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobar.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar.h | 2 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar_container.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/infobars/infobar.cc b/chrome/browser/infobars/infobar.cc index 8a37ced..079b571 100644 --- a/chrome/browser/infobars/infobar.cc +++ b/chrome/browser/infobars/infobar.cc @@ -37,7 +37,7 @@ SkColor GetInfoBarBottomColor(InfoBarDelegate::Type infobar_type) { } // TODO(pkasting): Port Mac to use this. -#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) +#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) || defined(OS_ANDROID) InfoBar::InfoBar(InfoBarService* owner, InfoBarDelegate* delegate) : owner_(owner), @@ -188,4 +188,4 @@ void InfoBar::MaybeDelete() { } } -#endif // TOOLKIT_VIEWS || TOOLKIT_GTK +#endif // TOOLKIT_VIEWS || TOOLKIT_GTK || OS_ANDROID diff --git a/chrome/browser/infobars/infobar.h b/chrome/browser/infobars/infobar.h index eab823e..1c0fbb9 100644 --- a/chrome/browser/infobars/infobar.h +++ b/chrome/browser/infobars/infobar.h @@ -27,7 +27,7 @@ typedef std::pair<InfoBarDelegate*, bool> InfoBarRemovedDetails; typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> InfoBarReplacedDetails; // TODO(pkasting): Port Mac to use this. -#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) +#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) || defined(OS_ANDROID) class InfoBarContainer; class InfoBarService; diff --git a/chrome/browser/infobars/infobar_container.cc b/chrome/browser/infobars/infobar_container.cc index bb13a07..9b8ce11 100644 --- a/chrome/browser/infobars/infobar_container.cc +++ b/chrome/browser/infobars/infobar_container.cc @@ -5,7 +5,7 @@ #include "build/build_config.h" // TODO(pkasting): Port Mac to use this. -#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) +#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) || defined(OS_ANDROID) #include "chrome/browser/infobars/infobar_container.h" @@ -265,4 +265,4 @@ int InfoBarContainer::ArrowTargetHeightForInfoBar(size_t infobar_index) const { first_infobar_animation.GetCurrentValue()); } -#endif // TOOLKIT_VIEWS || defined(TOOLKIT_GTK) +#endif // TOOLKIT_VIEWS || defined(TOOLKIT_GTK) || defined(OS_ANDROID) |