Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.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/ui/webui/options2/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::UserMetricsAction;
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 CrosLanguageOptionsHandler::CrosLanguageOptionsHandler() {
 }
 
 CrosLanguageOptionsHandler::~CrosLanguageOptionsHandler() {
 }
 
 void CrosLanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
-  ::options2::LanguageOptionsHandlerCommon::GetLocalizedValues(
+  ::options::LanguageOptionsHandlerCommon::GetLocalizedValues(
       localized_strings);
 
   RegisterTitle(localized_strings, "languagePage",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_AND_INPUT_DIALOG_TITLE);
   localized_strings->SetString("ok_button", l10n_util::GetStringUTF16(IDS_OK));
   localized_strings->SetString("configure",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE));
   localized_strings->SetString("input_method",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
   localized_strings->SetString("please_add_another_input_method",
@@ skipping 15 matching lines @@
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::GetInstance();
   // GetSupportedInputMethods() never return NULL.
   scoped_ptr<input_method::InputMethodDescriptors> descriptors(
       manager->GetSupportedInputMethods());
   localized_strings->Set("languageList", GetLanguageList(*descriptors));
   localized_strings->Set("inputMethodList", GetInputMethodList(*descriptors));
 }
 
 void CrosLanguageOptionsHandler::RegisterMessages() {
-  ::options2::LanguageOptionsHandlerCommon::RegisterMessages();
+  ::options::LanguageOptionsHandlerCommon::RegisterMessages();
 
   web_ui()->RegisterMessageCallback("inputMethodDisable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodDisableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodEnable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodEnableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodOptionsOpen",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback,
                  base::Unretained(this)));
@@ skipping 143 matching lines @@
 }
 
 void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
     const ListValue* args) {
   const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args));
   const std::string action = base::StringPrintf(
       "InputMethodOptions_Open_%s", input_method_id.c_str());
   content::RecordComputedAction(action);
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos