Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/browser/ui/webui/options/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/options/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
+#include "ash/display/display_manager.h"
 #include "ash/display/output_configurator_animation.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/display/overscan_calibrator.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"
 #include "ui/gfx/screen.h"
 
 namespace chromeos {
 namespace options {
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
-  aura::Env::GetInstance()->display_manager()->AddObserver(this);
+  ash::Shell::GetScreen()->AddObserver(this);
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
-  aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
+  ash::Shell::GetScreen()->RemoveObserver(this);
 }
 
 void DisplayOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   RegisterTitle(localized_strings, "displayOptionsPage",
                 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE);
   localized_strings->SetString("startMirroring", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_START_MIRRORING));
   localized_strings->SetString("stopMirroring", l10n_util::GetStringUTF16(
@@ skipping 75 matching lines @@
       ash::Shell::GetInstance()->output_configurator()->output_state();
   base::FundamentalValue show_options(
       output_state != chromeos::STATE_INVALID &&
       output_state != chromeos::STATE_HEADLESS &&
       output_state != chromeos::STATE_SINGLE);
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.showDisplayOptions", show_options);
 }
 
 void DisplayOptionsHandler::SendDisplayInfo() {
-  aura::DisplayManager* display_manager =
-      aura::Env::GetInstance()->display_manager();
+  ash::internal::DisplayManager* display_manager =
+      ash::Shell::GetInstance()->display_manager();
   ash::DisplayController* display_controller =
       ash::Shell::GetInstance()->display_controller();
   chromeos::OutputConfigurator* output_configurator =
       ash::Shell::GetInstance()->output_configurator();
   base::FundamentalValue mirroring(
       output_configurator->output_state() == chromeos::STATE_DUAL_MIRROR);
 
   int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
   base::ListValue displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
@@ skipping 158 matching lines @@
       !args->GetDouble(2, &bottom) || !args->GetDouble(3, &right)) {
     LOG(ERROR) << "Can't find overscan insets data.";
     return;
   }
 
   overscan_calibrator_->UpdateInsets(gfx::Insets(top, left, bottom, right));
 }
 
 }  // namespace options
 }  // namespace chromeos