Move gfx::Display/Screen to display::Display/Screen in ui/base

ui/base/layout.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 "ui/base/layout.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/base/touch/touch_device.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/screen.h"
 
 namespace ui {
 
 namespace {
 
 std::vector<ScaleFactor>* g_supported_scale_factors = NULL;
 
 }  // namespace
 
 void SetSupportedScaleFactors(
@@ skipping 67 matching lines @@
   } else {
     delete g_supported_scale_factors;
     g_supported_scale_factors = NULL;
   }
 }
 
 }  // namespace test
 
 #if !defined(OS_MACOSX)
 float GetScaleFactorForNativeView(gfx::NativeView view) {
-  return gfx::Screen::GetScreen()
+  return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(view)
       .device_scale_factor();
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui