Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/options_ui.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/options_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 80 matching lines @@
 
 using content::RenderViewHost;
 
 namespace {
 
 const char kLocalizedStringsFile[] = "strings.js";
 const char kOptionsBundleJsFile[]  = "options_bundle.js";
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   // The constructor takes over ownership of |localized_strings|.
@@ skipping 99 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 OptionsUI::OptionsUI(content::WebUI* web_ui)
     : WebUIController(web_ui),
       initialized_handlers_(false) {
   DictionaryValue* localized_strings = new DictionaryValue();
 
   CoreOptionsHandler* core_handler;
 #if defined(OS_CHROMEOS)
-  core_handler = new chromeos::options2::CoreChromeOSOptionsHandler();
+  core_handler = new chromeos::options::CoreChromeOSOptionsHandler();
 #else
   core_handler = new CoreOptionsHandler();
 #endif
   core_handler->set_handlers_host(this);
   AddOptionsPageUIHandler(localized_strings, core_handler);
 
   AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
 
   BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler();
   AddOptionsPageUIHandler(localized_strings, browser_options_handler);
 
   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
   AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler());
   AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::CrosLanguageOptionsHandler());
+                          new chromeos::options::CrosLanguageOptionsHandler());
 #else
   AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
   AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
   AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
       g_browser_process->profile_manager()));
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::AccountsOptionsHandler());
+                          new chromeos::options::AccountsOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::BluetoothOptionsHandler());
+                          new chromeos::options::BluetoothOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::DisplayOptionsHandler());
+                          new chromeos::options::DisplayOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageChewingHandler());
+                          new chromeos::options::LanguageChewingHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::KeyboardHandler());
+                          new chromeos::options::KeyboardHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageHangulHandler());
+                          new chromeos::options::LanguageHangulHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageMozcHandler());
+                          new chromeos::options::LanguageMozcHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguagePinyinHandler());
+                          new chromeos::options::LanguagePinyinHandler());
 
-  chromeos::options2::PointerHandler* pointer_handler =
-      new chromeos::options2::PointerHandler();
+  chromeos::options::PointerHandler* pointer_handler =
+      new chromeos::options::PointerHandler();
   AddOptionsPageUIHandler(localized_strings, pointer_handler);
 
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::ProxyHandler());
+                          new chromeos::options::ProxyHandler());
   AddOptionsPageUIHandler(
       localized_strings,
-      new chromeos::options2::ChangePictureOptionsHandler());
+      new chromeos::options::ChangePictureOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::StatsOptionsHandler());
+                          new chromeos::options::StatsOptionsHandler());
 #endif
 #if defined(OS_CHROMEOS) && defined(USE_ASH)
   AddOptionsPageUIHandler(
       localized_strings,
-      new chromeos::options2::SetWallpaperOptionsHandler());
+      new chromeos::options::SetWallpaperOptionsHandler());
 #endif
 #if defined(USE_NSS)
   AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
 
   // |localized_strings| ownership is taken over by this constructor.
   OptionsUIHTMLSource* html_source =
       new OptionsUIHTMLSource(localized_strings);
 
   // Set up the chrome://settings-frame/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, html_source);
 
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   ChromeURLDataManager::AddDataSource(profile, theme);
 
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
-  chromeos::options2::UserImageSource* user_image_source =
-      new chromeos::options2::UserImageSource();
+  chromeos::options::UserImageSource* user_image_source =
+      new chromeos::options::UserImageSource();
   ChromeURLDataManager::AddDataSource(profile, user_image_source);
 
   // Set up the chrome://wallpaper-thumb/ source.
-  chromeos::options2::WallpaperThumbnailSource* wallpaper_thumbnail_source =
-      new chromeos::options2::WallpaperThumbnailSource();
+  chromeos::options::WallpaperThumbnailSource* wallpaper_thumbnail_source =
+      new chromeos::options::WallpaperThumbnailSource();
   ChromeURLDataManager::AddDataSource(profile, wallpaper_thumbnail_source);
 
   pointer_device_observer_.reset(
       new chromeos::system::PointerDeviceObserver());
   pointer_device_observer_->AddObserver(browser_options_handler);
   pointer_device_observer_->AddObserver(pointer_handler);
 #endif
 }
 
 OptionsUI::~OptionsUI() {
@@ skipping 61 matching lines @@
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     // Add handler to the list and also pass the ownership.
     web_ui()->AddMessageHandler(handler.release());
     handler_raw->GetLocalizedValues(localized_strings);
     handlers_.push_back(handler_raw);
   }
 }
 
-}  // namespace options2
+}  // namespace options