Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/keyboard_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/keyboard_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 16 matching lines @@
 };
 
 const char* kDataValuesNames[] = {
   "xkbRemapSearchKeyToValue",
   "xkbRemapControlKeyToValue",
   "xkbRemapAltKeyToValue",
 };
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 KeyboardHandler::KeyboardHandler() {
 }
 
 KeyboardHandler::~KeyboardHandler() {
 }
 
 void KeyboardHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
@@ skipping 23 matching lines @@
       ListValue* option = new ListValue();
       option->Append(Value::CreateIntegerValue(value));
       option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
           message_id)));
       list_value->Append(option);
     }
     localized_strings->Set(kDataValuesNames[i], list_value);
   }
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos