Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/proxy_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/proxy_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 ProxyHandler::ProxyHandler() {
 }
 
 ProxyHandler::~ProxyHandler() {
 }
 
 void ProxyHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
@@ skipping 21 matching lines @@
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 
   localized_strings->SetString("enableSharedProxiesBannerText",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,
           l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos