Options: Rename options2 namespace to options.

chrome/browser/ui/webui/chromeos/login/oobe_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/chromeos/login/oobe_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 158 matching lines @@
   // Set up the chrome://terms/ data source, for EULA content.
   AboutUIHTMLSource* about_source =
       new AboutUIHTMLSource(chrome::kChromeUITermsHost, profile);
   ChromeURLDataManager::AddDataSource(profile, about_source);
 
   // Set up the chrome://oobe/ source.
   OobeUIHTMLSource* html_source = new OobeUIHTMLSource(localized_strings);
   ChromeURLDataManager::AddDataSource(profile, html_source);
 
   // Set up the chrome://userimage/ source.
-  options2::UserImageSource* user_image_source =
-      new options2::UserImageSource();
+  options::UserImageSource* user_image_source =
+      new options::UserImageSource();
   ChromeURLDataManager::AddDataSource(profile, user_image_source);
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe)) {
     // Set up the chrome://wallpaper/ source.
-    chromeos::options2::WallpaperImageSource* wallpaper_image_source =
-        new chromeos::options2::WallpaperImageSource();
+    chromeos::options::WallpaperImageSource* wallpaper_image_source =
+        new chromeos::options::WallpaperImageSource();
     ChromeURLDataManager::AddDataSource(profile, wallpaper_image_source);
   }
 }
 
 OobeUI::~OobeUI() {
 }
 
 void OobeUI::ShowScreen(WizardScreen* screen) {
   screen->Show();
 }
@@ skipping 83 matching lines @@
 
 void OobeUI::ResetSigninScreenHandlerDelegate() {
   signin_screen_handler_->SetDelegate(NULL);
 }
 
 void OobeUI::OnLoginPromptVisible() {
   user_image_screen_actor_->CheckCameraPresence();
 }
 
 }  // namespace chromeos