Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/display_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_DISPLAY_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_
 
 #include <vector>
 
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "ui/aura/display_observer.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // Display options overlay page UI handler.
-class DisplayOptionsHandler : public ::options2::OptionsPageUIHandler,
+class DisplayOptionsHandler : public ::options::OptionsPageUIHandler,
                               public aura::DisplayObserver {
  public:
   DisplayOptionsHandler();
   virtual ~DisplayOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializePage() OVERRIDE;
 
@@ skipping 23 matching lines @@
   void FadeOutForDisplayLayoutFinished(int layout, int offset);
 
   // Handlers of JS messages.
   void HandleDisplayInfo(const base::ListValue* unused_args);
   void HandleMirroring(const base::ListValue* args);
   void HandleDisplayLayout(const base::ListValue* args);
 
   DISALLOW_COPY_AND_ASSIGN(DisplayOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_