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

ash/system/web_notification/ash_popup_alignment_delegate_unittest.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 <utility>
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center_style.h"
 
 namespace ash {
 
 class AshPopupAlignmentDelegateTest : public test::AshTestBase {
  public:
   AshPopupAlignmentDelegateTest() {}
   ~AshPopupAlignmentDelegateTest() override {}
@@ skipping 24 matching lines @@
     BOTTOM_LEFT,
     BOTTOM_RIGHT,
     OUTSIDE
   };
 
   AshPopupAlignmentDelegate* alignment_delegate() {
     return alignment_delegate_.get();
   }
 
   void UpdateWorkArea(AshPopupAlignmentDelegate* alignment_delegate,
-                      const gfx::Display& display) {
-    alignment_delegate->StartObserving(gfx::Screen::GetScreen(), display);
+                      const display::Display& display) {
+    alignment_delegate->StartObserving(display::Screen::GetScreen(), display);
     // Update the layout
     alignment_delegate->OnDisplayWorkAreaInsetsChanged();
   }
 
   void SetAlignmentDelegate(
       std::unique_ptr<AshPopupAlignmentDelegate> delegate) {
     if (!delegate.get()) {
       alignment_delegate_.reset();
       return;
     }
     alignment_delegate_ = std::move(delegate);
     UpdateWorkArea(alignment_delegate_.get(),
-                   gfx::Screen::GetScreen()->GetPrimaryDisplay());
+                   display::Screen::GetScreen()->GetPrimaryDisplay());
   }
 
   Position GetPositionInDisplay(const gfx::Point& point) {
     const gfx::Rect& work_area =
-        gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
+        display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
     const gfx::Point center_point = work_area.CenterPoint();
     if (work_area.x() > point.x() || work_area.y() > point.y() ||
         work_area.right() < point.x() || work_area.bottom() < point.y()) {
       return OUTSIDE;
     }
 
     if (center_point.x() < point.x())
       return (center_point.y() < point.y()) ? BOTTOM_RIGHT : TOP_RIGHT;
     else
       return (center_point.y() < point.y()) ? BOTTOM_LEFT : TOP_LEFT;
@@ skipping 170 matching lines @@
             alignment_delegate()->GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, Extended) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("600x600,800x800");
   SetAlignmentDelegate(base::WrapUnique(new AshPopupAlignmentDelegate(
       Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
 
-  gfx::Display second_display = ScreenUtil::GetSecondaryDisplay();
+  display::Display second_display = ScreenUtil::GetSecondaryDisplay();
   aura::Window* second_root =
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->GetRootWindowForDisplayId(second_display.id());
   AshPopupAlignmentDelegate for_2nd_display(
       Shelf::ForWindow(second_root)->shelf_layout_manager());
   UpdateWorkArea(&for_2nd_display, second_display);
   // Make sure that the toast position on the secondary display is
   // positioned correctly.
   EXPECT_LT(1300, for_2nd_display.GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
@@ skipping 37 matching lines @@
   SetKeyboardBounds(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   SetKeyboardBounds(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash