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

chrome/browser/ui/ime/ime_window.cc

 // Copyright 2016 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/ime/ime_window.h"
 
 #include <utility>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ime/ime_native_window.h"
 #include "chrome/browser/ui/ime/ime_window_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/screen.h"
 
 namespace {
 
 // The vertical margin between the cursor and the follow-cursor window.
 const int kFollowCursorMargin = 3;
 
 // The offset from the left of follow cursor window to the left of cursor.
 const int kFollowCursorOffset = 32;
 
 }  // namespace
@@ skipping 60 matching lines @@
 
 void ImeWindow::SetBounds(const gfx::Rect& bounds) {
   native_window_->SetBounds(bounds);
 }
 
 void ImeWindow::FollowCursor(const gfx::Rect& cursor_bounds) {
   if (mode_ != FOLLOW_CURSOR)
     return;
 
   gfx::Rect screen_bounds =
-      gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
+      display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   gfx::Rect window_bounds = native_window_->GetBounds();
   int screen_width = screen_bounds.width();
   int screen_height = screen_bounds.height();
   int width = window_bounds.width();
   int height = window_bounds.height();
   // By default, aligns the left of the window client area to the left of the
   // cursor, and aligns the top of the window to the bottom of the cursor.
   // If the right of the window would go beyond the screen bounds, aligns the
   // right of the window to the screen bounds.
   // If the bottom of the window would go beyond the screen bounds, aligns the
@@ skipping 76 matching lines @@
   bounds.set_width(pos.width());
   bounds.set_height(pos.height());
   native_window_->SetBounds(bounds);
 }
 
 bool ImeWindow::IsPopupOrPanel(const content::WebContents* source) const {
   return true;
 }
 
 }  // namespace ui