Refactor the translate infobars on mac to match the new windows code.

chrome/browser/translate/translate_infobar_delegate2.cc

 // Copyright (c) 2010 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 <algorithm>
 
 #include "chrome/browser/translate/translate_infobar_delegate2.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 39 matching lines @@
          (type_ == TRANSLATION_ERROR && error != TranslateErrors::NONE));
 
   std::vector<std::string> language_codes;
   TranslateManager2::GetSupportedLanguages(&language_codes);
 
   languages_.reserve(language_codes.size());
   for (std::vector<std::string>::const_iterator iter = language_codes.begin();
        iter != language_codes.end(); ++iter) {
     std::string language_code = *iter;
 
-    if (language_code == original_language)
-      original_language_index_ = iter - language_codes.begin();
-    else if (language_code == target_language)
-      target_language_index_ = iter - language_codes.begin();
-
     string16 language_name = GetLanguageDisplayableName(language_code);
     // Insert the language in languages_ in alphabetical order.
     std::vector<LanguageNamePair>::iterator iter2;
     for (iter2 = languages_.begin(); iter2 != languages_.end(); ++iter2) {
       if (language_name.compare(iter2->second) < 0)
         break;
     }
     languages_.insert(iter2, LanguageNamePair(language_code, language_name));
   }
+  for (std::vector<LanguageNamePair>::const_iterator iter = languages_.begin();
+       iter != languages_.end(); ++iter) {
+    std::string language_code = iter->first;
+    if (language_code == original_language)
+      original_language_index_ = iter - languages_.begin();
+    else if (language_code == target_language)
+      target_language_index_ = iter - languages_.begin();
+  }
+
   DCHECK(original_language_index_ != -1);
   DCHECK(target_language_index_ != -1);
 }
 
 int TranslateInfoBarDelegate2::GetLanguageCount() const {
   return static_cast<int>(languages_.size());
 }
 
 const std::string& TranslateInfoBarDelegate2::GetLanguageCodeAt(
     int index) const {
@@ skipping 209 matching lines @@
     *swap_languages = true;
   } else {
     *swap_languages = false;
   }
 
   strings->push_back(text.substr(0, offsets[0]));
   strings->push_back(text.substr(offsets[0], offsets[1]));
   strings->push_back(text.substr(offsets[1]));
 }
 
-#if !defined(OS_WIN) && !defined(OS_CHROMEOS)
+#if !defined(OS_WIN) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
 // Necessary so we link OK on Mac and Linux while the new translate infobars
 // are being ported to these platforms.
 InfoBar* TranslateInfoBarDelegate2::CreateInfoBar() {
   return NULL;
 }
 #endif