Rename gfx::Display/Screen to display::Display/Screen in ash

ash/system/web_notification/ash_popup_alignment_delegate.cc

 // Copyright 2014 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/web_notification/ash_popup_alignment_delegate.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/window.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_popup_collection.h"
 
 namespace ash {
 
 namespace {
 
 const int kToastMarginX = 3;
 
 // If there should be no margin for the first item, this value needs to be
 // substracted to flush the message to the shelf (the width of the border +
 // shadow).
 const int kNoToastMarginBorderAndShadowOffset = 2;
 
 }
 
 AshPopupAlignmentDelegate::AshPopupAlignmentDelegate(ShelfLayoutManager* shelf)
     : screen_(NULL), shelf_(shelf), system_tray_height_(0) {
   shelf_->AddObserver(this);
 }
 
 AshPopupAlignmentDelegate::~AshPopupAlignmentDelegate() {
   if (screen_)
     screen_->RemoveObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
   shelf_->RemoveObserver(this);
 }
 
-void AshPopupAlignmentDelegate::StartObserving(gfx::Screen* screen,
-                                               const gfx::Display& display) {
+void AshPopupAlignmentDelegate::StartObserving(
+    display::Screen* screen,
+    const display::Display& display) {
   screen_ = screen;
   work_area_ = display.work_area();
   screen->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
   if (system_tray_height_ > 0)
     UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::SetSystemTrayHeight(int height) {
   system_tray_height_ = height;
@@ skipping 36 matching lines @@
 
 bool AshPopupAlignmentDelegate::IsTopDown() const {
   return false;
 }
 
 bool AshPopupAlignmentDelegate::IsFromLeft() const {
   return GetAlignment() == wm::SHELF_ALIGNMENT_LEFT;
 }
 
 void AshPopupAlignmentDelegate::RecomputeAlignment(
-    const gfx::Display& display) {
+    const display::Display& display) {
   // Nothing needs to be done.
 }
 
 wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }
 
-gfx::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(
+display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea() {
   work_area_ = shelf_->user_work_area_bounds();
   DoUpdateIfPossible();
 }
 
 void AshPopupAlignmentDelegate::OnDisplayWorkAreaInsetsChanged() {
   UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::OnAutoHideStateChanged(
     ShelfAutoHideState new_state) {
   UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::OnDisplayAdded(
-    const gfx::Display& new_display) {
-}
+    const display::Display& new_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayRemoved(
-    const gfx::Display& old_display) {
-}
+    const display::Display& old_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
-    const gfx::Display& display,
+    const display::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();
 }
 
 }  // namespace ash