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

ash/wm/immersive_fullscreen_controller.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 "ash/wm/immersive_fullscreen_controller.h"
 
 #include <set>
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/resize_handle_window_targeter.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/metrics/histogram.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/animation/slide_animation.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 using views::View;
 
 namespace ash {
@@ skipping 63 matching lines @@
   gfx::Point location_in_screen = event.location();
   aura::Window* target = static_cast<aura::Window*>(event.target());
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(target->GetRootWindow());
   screen_position_client->ConvertPointToScreen(target, &location_in_screen);
   return location_in_screen;
 }
 
 // Returns the bounds of the display nearest to |window| in screen coordinates.
 gfx::Rect GetDisplayBoundsInScreen(aura::Window* window) {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).bounds();
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(window).bounds();
 }
 
 }  // namespace
 
 // The height in pixels of the region below the top edge of the display in which
 // the mouse can trigger revealing the top-of-window views.
 #if defined(OS_WIN)
 // Windows 8 reserves some pixels at the top of the screen for the hand icon
 // that allows you to drag a metro app off the screen, so a few additional
 // pixels of space must be reserved for the mouse reveal.
@@ skipping 796 matching lines @@
   gfx::Rect hit_bounds_in_screen(GetDisplayBoundsInScreen(native_window_));
   hit_bounds_in_screen.set_height(kImmersiveFullscreenTopEdgeInset);
   if (hit_bounds_in_screen.Contains(location))
     return true;
 
   // There may be a bezel sensor off screen logically above
   // |hit_bounds_in_screen|. The check for the event not contained by the
   // closest screen ensures that the event is from a valid bezel (as opposed to
   // another screen in an extended desktop).
   gfx::Rect screen_bounds =
-      gfx::Screen::GetScreen()->GetDisplayNearestPoint(location).bounds();
+      display::Screen::GetScreen()->GetDisplayNearestPoint(location).bounds();
   return (!screen_bounds.Contains(location) &&
           location.y() < hit_bounds_in_screen.y() &&
           location.x() >= hit_bounds_in_screen.x() &&
           location.x() < hit_bounds_in_screen.right());
 }
 
 void ImmersiveFullscreenController::RecreateBubbleObserver() {
   bubble_observer_.reset(new BubbleObserver(this));
   const std::vector<aura::Window*> transient_children =
       ::wm::GetTransientChildren(native_window_);
   for (size_t i = 0; i < transient_children.size(); ++i) {
     aura::Window* transient_child = transient_children[i];
     views::View* anchor_view = GetAnchorView(transient_child);
     if (anchor_view && top_container_->Contains(anchor_view))
       bubble_observer_->StartObserving(transient_child);
   }
 }
 
 }  // namespace ash