Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/system/chromeos/tray_display.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 "ash/system/chromeos/tray_display.h"
 
 #include "ash/display/display_controller.h"
-#include "ash/display/multi_display_manager.h"
+#include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 namespace internal {
@@ skipping 42 matching lines @@
         return;
       }
       default:
         NOTREACHED();
     }
   }
 
  private:
   // Returns the name of the currently connected external display.
   string16 GetExternalDisplayName() {
-    MultiDisplayManager* display_manager = static_cast<MultiDisplayManager*>(
-        aura::Env::GetInstance()->display_manager());
+    DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
     gfx::Display external_display(gfx::Display::kInvalidDisplayID);
     if (display_manager->HasInternalDisplay()) {
       for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
         gfx::Display* display = display_manager->GetDisplayAt(i);
         if (!display_manager->IsInternalDisplayId(display->id())) {
           external_display = *display;
           break;
         }
       }
@@ skipping 18 matching lines @@
   }
 
   user::LoginStatus login_status_;
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayView);
 };
 
 TrayDisplay::TrayDisplay()
     : default_(NULL) {
-  aura::Env::GetInstance()->display_manager()->AddObserver(this);
-  ash::Shell::GetInstance()->output_configurator()->AddObserver(this);
+  Shell::GetScreen()->AddObserver(this);
+  Shell::GetInstance()->output_configurator()->AddObserver(this);
 }
 
 TrayDisplay::~TrayDisplay() {
-  aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
-  ash::Shell::GetInstance()->output_configurator()->RemoveObserver(this);
+  Shell::GetScreen()->RemoveObserver(this);
+  Shell::GetInstance()->output_configurator()->RemoveObserver(this);
 }
 
 views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {
   default_ = new DisplayView(status);
   return default_;
 }
 
 void TrayDisplay::DestroyDefaultView() {
   default_ = NULL;
 }
@@ skipping 13 matching lines @@
     default_->Update();
 }
 
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash