Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

content/shell/shell_aura.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 "content/shell/shell.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/desktop/desktop_screen.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_display_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/screen_ash.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/shell/shell_stacking_client_ash.h"
+#include "ui/aura/test/test_screen.h"
 #else
 #include "ui/aura/desktop/desktop_stacking_client.h"
 #endif
 
 // ViewDelegate implementation for aura content shell
 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
  public:
   ShellViewsDelegateAura() : use_transparent_windows_(false) {
   }
 
@@ skipping 231 matching lines @@
 namespace content {
 
 aura::client::StackingClient* Shell::stacking_client_ = NULL;
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
 #endif
-  aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
 #if defined(OS_CHROMEOS)
   stacking_client_ = new content::ShellStackingClientAsh();
   gfx::Screen::SetScreenInstance(
-      gfx::SCREEN_TYPE_NATIVE, new ash::ScreenAsh);
+      gfx::SCREEN_TYPE_NATIVE, new aura::TestScreen);
 #else
   stacking_client_ = new aura::DesktopStackingClient();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());
 #endif
   views_delegate_ = new ShellViewsDelegateAura();
 }
 
 void Shell::PlatformExit() {
   if (stacking_client_)
@@ skipping 55 matching lines @@
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content