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

chrome/browser/ui/window_sizer/window_sizer_ash.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/window_sizer/window_sizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_positioner.h"
 #include "ash/wm/common/window_state.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds,
                                       ui::WindowShowState* show_state) const {
   if (!chrome::ShouldOpenAshOnStartup() || !browser_)
     return false;
 
   bool determined = false;
   if (bounds->IsEmpty()) {
     if (browser_->is_type_tabbed()) {
       GetTabbedBrowserBoundsAsh(bounds, show_state);
@@ skipping 17 matching lines @@
   } else if (browser_->is_type_popup() && bounds->origin().IsOrigin()) {
     // In case of a popup with an 'unspecified' location in ash, we are
     // looking for a good screen location. We are interpreting (0,0) as an
     // unspecified location.
     *bounds = ash::Shell::GetInstance()->window_positioner()->
         GetPopupPosition(*bounds);
     determined = true;
   }
 
   if (browser_->is_type_tabbed() && *show_state == ui::SHOW_STATE_DEFAULT) {
-    gfx::Display display = screen_->GetDisplayMatching(*bounds);
+    display::Display display = screen_->GetDisplayMatching(*bounds);
     gfx::Rect work_area = display.work_area();
     bounds->AdjustToFit(work_area);
     if (*bounds == work_area) {
       // A |browser_| that occupies the whole work area gets maximized.
       // |bounds| returned here become the restore bounds once the window
       // gets maximized after this method returns. Return a sensible default
       // in order to make restored state visibly different from maximized.
       *show_state = ui::SHOW_STATE_MAXIMIZED;
       *bounds = ash::WindowPositioner::GetDefaultWindowBounds(display);
       determined = true;
     }
   }
   return determined;
 }
 
 void WindowSizer::GetTabbedBrowserBoundsAsh(
     gfx::Rect* bounds_in_screen,
     ui::WindowShowState* show_state) const {
   DCHECK(show_state);
   DCHECK(bounds_in_screen);
   DCHECK(browser_->is_type_tabbed());
   DCHECK(bounds_in_screen->IsEmpty());
 
   ui::WindowShowState passed_show_state = *show_state;
 
   bool is_saved_bounds = GetSavedWindowBounds(bounds_in_screen, show_state);
-  gfx::Display display;
+  display::Display display;
   if (is_saved_bounds) {
     display = screen_->GetDisplayMatching(*bounds_in_screen);
   } else {
     // If there is no saved bounds (hence bounds_in_screen is empty), use the
     // target display.
     display = target_display_provider_->GetTargetDisplay(screen_,
                                                          *bounds_in_screen);
     *bounds_in_screen = ash::WindowPositioner::GetDefaultWindowBounds(display);
   }
 
@@ skipping 14 matching lines @@
 
   // The |browser_window| is non NULL when this is called after
   // browser's aura window is created.
   aura::Window* browser_window =
       browser_->window() ? browser_->window()->GetNativeWindow() : NULL;
 
   ash::WindowPositioner::GetBoundsAndShowStateForNewWindow(
       ash::wm::WmWindowAura::Get(browser_window), is_saved_bounds,
       passed_show_state, bounds_in_screen, show_state);
 }