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

chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

 // Copyright (c) 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 "chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h"
 
 #include "base/macros.h"
 #include "ui/aura/client/screen_position_client.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_event_details.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/image_view.h"
 
 class LinkDisambiguationPopup::ZoomBubbleView
     : public views::BubbleDialogDelegateView {
  public:
   ZoomBubbleView(views::Widget* top_level_widget,
                  const gfx::Rect& target_rect,
                  const gfx::ImageSkia* zoomed_skia_image,
                  LinkDisambiguationPopup* popup,
@@ skipping 148 matching lines @@
       aura::client::GetScreenPositionClient(content_->GetRootWindow());
   gfx::Point target_screen(target_rect.x() + (target_rect.width() / 2),
       target_rect.y() + (target_rect.height() / 2));
   if (screen_position_client)
     screen_position_client->ConvertPointToScreen(content_, &target_screen);
   gfx::Rect window_bounds(
       target_screen.x() - (zoomed_bitmap.width() / 2),
       target_screen.y() - (zoomed_bitmap.height() / 2),
       zoomed_bitmap.width(),
       zoomed_bitmap.height());
-  const gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(content);
+  const display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(content);
   window_bounds.AdjustToFit(display.work_area());
   view_->GetWidget()->SetBounds(window_bounds);
   view_->GetWidget()->Show();
 }
 
 void LinkDisambiguationPopup::Close() {
   if (view_ && view_->GetWidget())
     view_->GetWidget()->Close();
 }
 
 void LinkDisambiguationPopup::InvalidateBubbleView() {
   view_ = nullptr;
 }