Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/change_picture_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_CHANGE_PICTURE_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // ChromeOS user image options page UI handler.
-class ChangePictureOptionsHandler : public ::options2::OptionsPageUIHandler,
+class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,
                                     public ui::SelectFileDialog::Listener,
                                     public TakePhotoDialog::Delegate,
                                     public ImageDecoder::Delegate {
  public:
   ChangePictureOptionsHandler();
   virtual ~ChangePictureOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
@@ skipping 86 matching lines @@
 
   base::WeakPtrFactory<ChangePictureOptionsHandler> weak_factory_;
 
   // Last ImageDecoder instance used to decode an image blob received by
   // HandlePhotoTaken.
   scoped_refptr<ImageDecoder> image_decoder_;
 
   DISALLOW_COPY_AND_ASSIGN(ChangePictureOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_