Bug fix: Append a language to the list after blocking it for Translate on Chrome OS

chrome/browser/translate/translate_infobar_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
@@ skipping 193 matching lines @@
 void TranslateInfoBarDelegate::AlwaysTranslatePageLanguage() {
   const std::string& original_lang = original_language_code();
   const std::string& target_lang = target_language_code();
   DCHECK(!prefs_.IsLanguagePairWhitelisted(original_lang, target_lang));
   prefs_.WhitelistLanguagePair(original_lang, target_lang);
   Translate();
 }
 
 void TranslateInfoBarDelegate::NeverTranslatePageLanguage() {
   std::string original_lang = original_language_code();
-  DCHECK(!prefs_.IsBlockedLanguage(original_lang));
+  // The language might be already blocked when the language was blocked but
+  // removed from the language list of chrome://settings/languages.

[Takashi Toyoshima, 2013/09/09 12:26:11]

This comment is difficult to understand...

IIUC, the chrome://settings/languages allows a user to change settings
asynchronously. So, UI can not keep disable/enable status consistently with the
setting value. As a result, this delegate function may be called even though the
language is disabled by the setting, right?

I'm not sure your comment is aimed to say the same thing.

[hajimehoshi, 2013/09/10 03:21:45]

I aimed to say the other thing.

1. Open a Japanese page
2. Click 'Never Translate Japanese', and Japanese is added to the
blocked-languages list and Accept languages list.
3. Remove Japanese from Accept languages list
4. Open a Japanese page again. In this case, Translation infobar will appear
even though Japanese is still in the blocked-languages list

This is an expected behavior. Before using the blocked-languages list, this
never happens because the old blacklist (you know, the legacy list) was used
regardless of the Accept languages.

Anyway, I'll modify the comment later.

And I didn't come up with your case. Maybe your case causes the Asset error. Let
me check this later.

[hajimehoshi, 2013/09/10 05:23:04]

Done.

   prefs_.BlockLanguage(original_lang);
   RemoveSelf();
 }
 
 string16 TranslateInfoBarDelegate::GetMessageInfoBarText() {
   if (infobar_type_ == TRANSLATING) {
     return l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_TRANSLATING_TO,
                                       language_name_at(target_language_index_));
   }
 
@@ skipping 200 matching lines @@
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 std::string TranslateInfoBarDelegate::GetPageHost() {
   NavigationEntry* entry = web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }