Add chromeos namespace to the language options page and its friends.

chrome/browser/chromeos/dom_ui/language_options_handler.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 "chrome/browser/chromeos/dom_ui/language_options_handler.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
+namespace chromeos {
+
 LanguageOptionsHandler::LanguageOptionsHandler() {
 }
 
 LanguageOptionsHandler::~LanguageOptionsHandler() {
 }
 
 void LanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString(L"languagePage",
@@ skipping 29 matching lines @@
 }
 
 void LanguageOptionsHandler::RegisterMessages() {
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback("uiLanguageChange",
       NewCallback(this,
                   &LanguageOptionsHandler::UiLanguageChangeCallback));
 }
 
 ListValue* LanguageOptionsHandler::GetInputMethodList() {
-  using chromeos::CrosLibrary;
-
   ListValue* input_method_list = new ListValue();
 
   // GetSupportedLanguages() never return NULL.
-  scoped_ptr<chromeos::InputMethodDescriptors> descriptors(
+  scoped_ptr<InputMethodDescriptors> descriptors(
       CrosLibrary::Get()->GetInputMethodLibrary()->GetSupportedInputMethods());
   for (size_t i = 0; i < descriptors->size(); ++i) {
-    const chromeos::InputMethodDescriptor& descriptor = descriptors->at(i);
+    const InputMethodDescriptor& descriptor = descriptors->at(i);
     const std::string language_code =
-        chromeos::input_method::GetLanguageCodeFromDescriptor(descriptor);
+        input_method::GetLanguageCodeFromDescriptor(descriptor);
     const std::string display_name =
-        chromeos::input_method::GetInputMethodDisplayNameFromId(descriptor.id);
+        input_method::GetInputMethodDisplayNameFromId(descriptor.id);
 
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString(L"id", UTF8ToWide(descriptor.id));
     dictionary->SetString(L"displayName", UTF8ToWide(display_name));
     dictionary->SetString(L"languageCode", UTF8ToWide(language_code));
     input_method_list->Append(dictionary);
   }
 
   return input_method_list;
 }
 
 ListValue* LanguageOptionsHandler::GetLanguageList() {
   // Map of display name -> {language code, native_display_name}.
   // In theory, we should be able to create a map that is sorted by
   // display names using ICU comparator, but doing it is hard, thus we'll
   // use an auxiliary vector to achieve the same result.
   typedef std::pair<std::string, std::wstring> LanguagePair;
   typedef std::map<std::wstring, LanguagePair> LanguageMap;
   LanguageMap language_map;
   // The auxiliary vector mentioned above.
   std::vector<std::wstring> display_names;
 
   // Build the list of display names, and build the language map.
   const std::vector<std::string>& locales = l10n_util::GetAvailableLocales();
   for (size_t i = 0; i < locales.size(); ++i) {
     const std::wstring display_name =
-        chromeos::input_method::GetLanguageDisplayNameFromCode(locales[i]);
+        input_method::GetLanguageDisplayNameFromCode(locales[i]);
     const std::wstring native_display_name =
-        chromeos::input_method::GetLanguageNativeDisplayNameFromCode(
+        input_method::GetLanguageNativeDisplayNameFromCode(
             locales[i]);
     display_names.push_back(display_name);
     language_map[display_name] =
         std::make_pair(locales[i], native_display_name);
   }
   DCHECK_EQ(display_names.size(), language_map.size());
 
   // Sort display names using locale specific sorter.
   l10n_util::SortStrings(g_browser_process->GetApplicationLocale(),
                          &display_names);
@@ skipping 26 matching lines @@
     NOTREACHED();
     LOG(INFO) << "NOTREACHED";
     return;
   }
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kApplicationLocale, language_code);
   prefs->SavePersistentPrefs();
   dom_ui_->CallJavascriptFunction(
       L"options.LanguageOptions.uiLanguageSaved");
 }
+
+}  // namespace chromeos