| Index: chrome/browser/views/infobars/translate_infobar_base.cc
|
| diff --git a/chrome/browser/views/infobars/translate_infobar_base.cc b/chrome/browser/views/infobars/translate_infobar_base.cc
|
| index 1527c0b0ad934c536281e2a5afd477d401cc8d3e..50c7120fb105e92e413b9d64d002f724021339f6 100644
|
| --- a/chrome/browser/views/infobars/translate_infobar_base.cc
|
| +++ b/chrome/browser/views/infobars/translate_infobar_base.cc
|
| @@ -30,14 +30,14 @@ TranslateInfoBarBase::TranslateInfoBarBase(
|
|
|
| TranslateInfoBarDelegate::BackgroundAnimationType animation =
|
| delegate->background_animation_type();
|
| - if (animation != TranslateInfoBarDelegate::kNone) {
|
| + if (animation != TranslateInfoBarDelegate::NONE) {
|
| background_color_animation_.reset(new SlideAnimation(this));
|
| background_color_animation_->SetTweenType(Tween::LINEAR);
|
| background_color_animation_->SetSlideDuration(500);
|
| - if (animation == TranslateInfoBarDelegate::kNormalToError) {
|
| + if (animation == TranslateInfoBarDelegate::NORMAL_TO_ERROR) {
|
| background_color_animation_->Show();
|
| } else {
|
| - DCHECK_EQ(TranslateInfoBarDelegate::kErrorToNormal, animation);
|
| + DCHECK_EQ(TranslateInfoBarDelegate::ERROR_TO_NORMAL, animation);
|
| // Hide() runs the animation in reverse.
|
| background_color_animation_->Reset(1.0);
|
| background_color_animation_->Hide();
|
| @@ -158,14 +158,14 @@ void TranslateInfoBarBase::FadeBackground(gfx::Canvas* canvas,
|
| InfoBar* TranslateInfoBarDelegate::CreateInfoBar() {
|
| TranslateInfoBarBase* infobar = NULL;
|
| switch (type_) {
|
| - case kBeforeTranslate:
|
| + case BEFORE_TRANSLATE:
|
| infobar = new BeforeTranslateInfoBar(this);
|
| break;
|
| - case kAfterTranslate:
|
| + case AFTER_TRANSLATE:
|
| infobar = new AfterTranslateInfoBar(this);
|
| break;
|
| - case kTranslating:
|
| - case kTranslationError:
|
| + case TRANSLATING:
|
| + case TRANSLATION_ERROR:
|
| infobar = new TranslateMessageInfoBar(this);
|
| break;
|
| default:
|
|
|