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

chrome/browser/ui/views/status_icons/status_tray_win.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 "chrome/browser/ui/views/status_icons/status_tray_win.h"
 
 #include <commctrl.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h"
 #include "chrome/common/chrome_constants.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 static const UINT kStatusIconMessage = WM_APP + 1;
 
 namespace {
 // |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
 const UINT kBaseIconId = 2;
 
 UINT ReservedIconId(StatusTray::StatusIconType type) {
   return kBaseIconId + static_cast<UINT>(type);
@@ skipping 154 matching lines @@
     switch (lparam) {
       case TB_INDETERMINATE:
         win_icon->HandleBalloonClickEvent();
         return TRUE;
 
       case WM_LBUTTONDOWN:
       case WM_RBUTTONDOWN:
       case WM_CONTEXTMENU:
         // Walk our icons, find which one was clicked on, and invoke its
         // HandleClickEvent() method.
-        gfx::Point cursor_pos(gfx::Screen::GetScreen()->GetCursorScreenPoint());
+        gfx::Point cursor_pos(
+            display::Screen::GetScreen()->GetCursorScreenPoint());
         win_icon->HandleClickEvent(cursor_pos, lparam == WM_LBUTTONDOWN);
         return TRUE;
     }
   } else if (message == WM_ENDSESSION) {
     // If Chrome is in background-only mode, this is the only notification
     // it gets that Windows is exiting. Make sure we shutdown in an orderly
     // fashion.
     chrome::SessionEnding();
   }
   return ::DefWindowProc(hwnd, message, wparam, lparam);
@@ skipping 23 matching lines @@
 }
 
 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest(
     std::unique_ptr<StatusTrayStateChangerProxy> proxy) {
   state_changer_proxy_ = std::move(proxy);
 }
 
 StatusTray* StatusTray::Create() {
   return new StatusTrayWin();
 }