Commit 7fdb82f2 authored by Josh Santana's avatar Josh Santana Committed by Chromium LUCI CQ

Always Translate Checkbox Translates Page

If a user decides to check "Always Translate" on the Bubble UI, it will now automatically translate the page upon them doing so, instead of them having to also click on their target language.

Bug: 1156275
Change-Id: I2d7aa033d575249d98bb95c90e510fd0dd5e332e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2582534Reviewed-by: default avatarJosh Simmons <jds@google.com>
Reviewed-by: default avatarTrevor  Perrier <perrier@chromium.org>
Reviewed-by: default avatarMegan Jablonski <megjablon@chromium.org>
Commit-Queue: Joshua Santana <joshsantana@google.com>
Cr-Commit-Position: refs/heads/master@{#836820}
parent f10bafe7
...@@ -572,8 +572,13 @@ void TranslateBubbleView::AlwaysTranslatePressed() { ...@@ -572,8 +572,13 @@ void TranslateBubbleView::AlwaysTranslatePressed() {
: translate::ALWAYS_TRANSLATE_UNCHECKED); : translate::ALWAYS_TRANSLATE_UNCHECKED);
// In the tab UI the always translate button should apply immediately // In the tab UI the always translate button should apply immediately
// except for in an advanced view. // except for in an advanced view.
if (GetViewState() != TranslateBubbleModel::VIEW_STATE_SOURCE_LANGUAGE) if (GetViewState() != TranslateBubbleModel::VIEW_STATE_SOURCE_LANGUAGE) {
model_->SetAlwaysTranslate(should_always_translate_); model_->SetAlwaysTranslate(should_always_translate_);
if (!model_->IsPageTranslatedInCurrentLanguages() &&
should_always_translate_) {
Translate();
}
}
} }
void TranslateBubbleView::UpdateChildVisibilities() { void TranslateBubbleView::UpdateChildVisibilities() {
......
...@@ -281,6 +281,11 @@ TEST_F(TranslateBubbleViewTest, AlwaysTranslateCheckboxShortcut) { ...@@ -281,6 +281,11 @@ TEST_F(TranslateBubbleViewTest, AlwaysTranslateCheckboxShortcut) {
EXPECT_TRUE(mock_model_->should_always_translate_); EXPECT_TRUE(mock_model_->should_always_translate_);
EXPECT_EQ(1, mock_model_->set_always_translate_called_count_); EXPECT_EQ(1, mock_model_->set_always_translate_called_count_);
EXPECT_TRUE(bubble_->always_translate_checkbox_->GetChecked()); EXPECT_TRUE(bubble_->always_translate_checkbox_->GetChecked());
EXPECT_TRUE(mock_model_->translate_called_);
EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_TRANSLATING,
bubble_->GetViewState());
EXPECT_EQ(bubble_->tabbed_pane_->GetSelectedTabIndex(),
static_cast<size_t>(1));
} }
TEST_F(TranslateBubbleViewTest, AlwaysTranslateCheckboxAndCloseButton) { TEST_F(TranslateBubbleViewTest, AlwaysTranslateCheckboxAndCloseButton) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment