diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 08:20:30 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 08:20:30 +0000 |
| commit | bccf5ab99c7f5dcb14afa20eb4c095ca2512c9b6 (patch) | |
| tree | ce0a1ffb98d0db3b6b4f518d638bbabfe6f500a9 /chrome/browser/autofill | |
| parent | 3fc7317059b04d3be66ce7fa6392519d7172eea9 (diff) | |
| download | chromium_src-bccf5ab99c7f5dcb14afa20eb4c095ca2512c9b6.zip chromium_src-bccf5ab99c7f5dcb14afa20eb4c095ca2512c9b6.tar.gz chromium_src-bccf5ab99c7f5dcb14afa20eb4c095ca2512c9b6.tar.bz2 | |
Merge TranslateTabHelper::TranslateStep and TranslateInfoBarDelegate::Type
TranslateTabHelper::TranslateStep, TranslateInfoBarDelegate::Type and
TranslateBubbleModel::ViewState all track the state of the Translate process.
This CL removes TranslateInfoBarDelegate::Type and removes a lot of references
to TranslateBubbleModel::ViewState, which now becomes an implementation
detail of TranslateBubbleModel.
BUG=NONE
TBR=jochen
Review URL: https://codereview.chromium.org/158813002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
| -rw-r--r-- | chrome/browser/autofill/autofill_interactive_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index 3a2e180c..25b6669 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -23,6 +23,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_service.h" +#include "chrome/browser/translate/translate_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -840,8 +841,7 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillAfterTranslate) { InfoBarService::FromWebContents(GetWebContents())->infobar_at(0)-> delegate()->AsTranslateInfoBarDelegate(); ASSERT_TRUE(delegate); - EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE, - delegate->infobar_type()); + EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, delegate->translate_step()); // Simulate translation button press. delegate->Translate(); |