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

content/common/page_state_serialization.cc

 // Copyright 2013 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 "content/common/page_state_serialization.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
 
 #include "base/pickle.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace content {
 namespace {
 
 #if defined(OS_ANDROID)
 float g_device_scale_factor_for_testing = 0.0;
 #endif
 
 //-----------------------------------------------------------------------------
 
@@ skipping 570 matching lines @@
     // Now-unused values that shipped in this version of Chrome for Android when
     // it was on a private branch.
     ReadReal(obj);
     ReadBoolean(obj);
 
     // In this version, page_scale_factor included device_scale_factor and
     // scroll offsets were premultiplied by pageScaleFactor.
     if (state->page_scale_factor) {
       float device_scale_factor = g_device_scale_factor_for_testing;
       if (!device_scale_factor) {
-        device_scale_factor =
-            gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
+        device_scale_factor = display::Screen::GetScreen()
+                                  ->GetPrimaryDisplay()
+                                  .device_scale_factor();
       }
       state->scroll_offset =
           gfx::Point(state->scroll_offset.x() / state->page_scale_factor,
                      state->scroll_offset.y() / state->page_scale_factor);
       state->page_scale_factor /= device_scale_factor;
     }
   }
 #endif
 
   // Subitems
@@ skipping 134 matching lines @@
     float device_scale_factor,
     ExplodedPageState* exploded) {
   g_device_scale_factor_for_testing = device_scale_factor;
   bool rv = DecodePageState(encoded, exploded);
   g_device_scale_factor_for_testing = 0.0;
   return rv;
 }
 #endif
 
 }  // namespace content