Make Combobox portable

chrome/browser/views/options/language_combobox_model.cc

 // Copyright (c) 2006-2008 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/views/options/language_combobox_model.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 55 matching lines @@
     locale_names_.push_back(name_local);
     native_names_[name_local] = LocaleData(name_native, locale_codes[i]);
   }
 
   // Sort using locale specific sorter.
   l10n_util::SortStrings(g_browser_process->GetApplicationLocale(),
                          &locale_names_);
 }
 
 // Overridden from views::Combobox::Model:
-int LanguageComboboxModel::GetItemCount(views::ComboBox* source) {
+int LanguageComboboxModel::GetItemCount(views::Combobox* source) {
   return static_cast<int>(locale_names_.size());
 }
 
-std::wstring LanguageComboboxModel::GetItemAt(views::ComboBox* source,
+std::wstring LanguageComboboxModel::GetItemAt(views::Combobox* source,
                                               int index) {
   DCHECK(static_cast<int>(locale_names_.size()) > index);
   LocaleDataMap::const_iterator it =
       native_names_.find(locale_names_[index]);
   DCHECK(it != native_names_.end());
 
   // If the name is the same in the native language and local language,
   // don't show it twice.
   if (it->second.native_name == locale_names_[index])
     return it->second.native_name;
@@ skipping 65 matching lines @@
     local_state = g_browser_process->local_state();
   else
     local_state = profile_->GetPrefs();
 
   DCHECK(local_state);
   const std::string& current_locale =
       WideToASCII(local_state->GetString(prefs.c_str()));
 
   return GetIndexFromLocale(current_locale);
 }