Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/display_options_handler.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/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/output_configurator_animation.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/json/json_value_converter.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/display/output_configurator.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 using ash::internal::DisplayController;
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
   aura::Env::GetInstance()->display_manager()->AddObserver(this);
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
   aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
 }
@@ skipping 144 matching lines @@
   DCHECK_LE(DisplayController::TOP, layout);
   DCHECK_GE(DisplayController::LEFT, layout);
   ash::Shell::GetInstance()->output_configurator_animation()->
       StartFadeOutAnimation(base::Bind(
           &DisplayOptionsHandler::FadeOutForDisplayLayoutFinished,
           base::Unretained(this),
           static_cast<int>(layout),
           static_cast<int>(offset)));
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos