Translate (Linux): add after infobar UI for server side language detection

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 262 matching lines @@
 
 // static
 string16 TranslateInfoBarDelegate::GetLanguageDisplayableName(
     const std::string& language_code) {
   return l10n_util::GetDisplayNameForLocale(
       language_code, g_browser_process->GetApplicationLocale(), true);
 }
 
 // static
 void TranslateInfoBarDelegate::GetAfterTranslateStrings(
-    std::vector<string16>* strings, bool* swap_languages) {
-  DCHECK(strings);
-  DCHECK(swap_languages);
-
-  std::vector<size_t> offsets;
-  string16 text =
-      l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE,
-                                 string16(), string16(), &offsets);
-  DCHECK_EQ(2U, offsets.size());
-
-  *swap_languages = (offsets[0] > offsets[1]);
-  if (*swap_languages)
-    std::swap(offsets[0], offsets[1]);
-
-  strings->push_back(text.substr(0, offsets[0]));
-  strings->push_back(text.substr(offsets[0], offsets[1] - offsets[0]));
-  strings->push_back(text.substr(offsets[1]));
-}
-
-// static
-void TranslateInfoBarDelegate::GetAfterTranslateWithAutoStrings(
-    std::vector<string16>* strings) {
+    std::vector<string16>* strings,
+    bool* swap_languages,
+    bool autodetermined_source_language) {
   DCHECK(strings);
 
-  size_t offset;
-  string16 text =
-      l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE_WITH_AUTO,
-                                 string16(), &offset);
+  if (autodetermined_source_language) {
+    size_t offset;
+    string16 text = l10n_util::GetStringFUTF16(
+        IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE_AUTODETERMINED_SOURCE_LANGUAGE,
+        string16(),
+        &offset);
 
-  strings->push_back(text.substr(0, offset));
-  strings->push_back(text.substr(offset));
+    strings->push_back(text.substr(0, offset));
+    strings->push_back(text.substr(offset));
+  } else {

[Peter Kasting, 2013/05/23 19:59:56]

Tiny nit: Might be better to early-return here so the rest of the function can
be unindented (and look exactly as it did previously)

[Takashi Toyoshima, 2013/05/27 06:07:51]

Done.

+    DCHECK(swap_languages);
+
+    std::vector<size_t> offsets;
+    string16 text = l10n_util::GetStringFUTF16(
+        IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE,
+        string16(),
+        string16(),
+        &offsets);
+    DCHECK_EQ(2U, offsets.size());
+
+    *swap_languages = (offsets[0] > offsets[1]);
+    if (*swap_languages)
+      std::swap(offsets[0], offsets[1]);
+
+    strings->push_back(text.substr(0, offsets[0]));
+    strings->push_back(text.substr(offsets[0], offsets[1] - offsets[0]));
+    strings->push_back(text.substr(offsets[1]));
+  }
 }
 
 TranslateInfoBarDelegate::TranslateInfoBarDelegate(
     Type infobar_type,
     TranslateErrors::Type error_type,
     InfoBarService* infobar_service,
     PrefService* prefs,
     ShortcutConfiguration shortcut_config,
     const std::string& original_language,
     const std::string& target_language)
@@ skipping 77 matching lines @@
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 std::string TranslateInfoBarDelegate::GetPageHost() {
   NavigationEntry* entry = web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }