Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_H_
 
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
@@ skipping 10 matching lines @@
 class WallpaperDelegate {
  public:
   // Call javascript function to add/update custom wallpaper thumbnail in
   // picker UI.
   virtual void SetCustomWallpaperThumbnail() = 0;
 
  protected:
   virtual ~WallpaperDelegate() {}
 };
 
-namespace options2 {
+namespace options {
 
 // ChromeOS user image options page UI handler.
-class SetWallpaperOptionsHandler : public ::options2::OptionsPageUIHandler,
+class SetWallpaperOptionsHandler : public ::options::OptionsPageUIHandler,
                                    public ui::SelectFileDialog::Listener,
                                    public WallpaperDelegate {
  public:
   SetWallpaperOptionsHandler();
   virtual ~SetWallpaperOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ skipping 38 matching lines @@
   gfx::NativeWindow GetBrowserWindow() const;
 
   // Shows a dialog box for selecting a file.
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
   base::WeakPtrFactory<SetWallpaperOptionsHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SetWallpaperOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_H_