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

ui/base/x/x11_util.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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 1233 matching lines @@
                        atom_properties.end(),
                        fullscreen_atom) !=
           atom_properties.end();
     }
   }
 
   gfx::Rect window_rect;
   if (!ui::GetOuterWindowBounds(window, &window_rect))
     return false;
 
-  // We can't use gfx::Screen here because we don't have an aura::Window. So
+  // We can't use display::Screen here because we don't have an aura::Window. So
   // instead just look at the size of the default display.
   //
   // TODO(erg): Actually doing this correctly would require pulling out xrandr,
   // which we don't even do in the desktop screen yet.
   ::XDisplay* display = gfx::GetXDisplay();
   ::Screen* screen = DefaultScreenOfDisplay(display);
   int width = WidthOfScreen(screen);
   int height = HeightOfScreen(screen);
   return window_rect.size() == gfx::Size(width, height);
 }
@@ skipping 204 matching lines @@
   if (depth)
     *depth = s_depth;
 }
 #endif
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui