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

ash/shelf/shelf_window_watcher.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/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/screen.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace {
 
 // Sets ShelfItem property by using the value of |details|.
 void SetShelfItemDetailsForShelfItem(ash::ShelfItem* item,
                                      const ash::ShelfItemDetails& details) {
   item->type = details.type;
   if (details.image_resource_id != ash::kInvalidImageResourceID) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ skipping 79 matching lines @@
       observed_root_windows_(&root_window_observer_),
       observed_removed_windows_(&removed_window_observer_),
       observed_activation_clients_(this) {
   // We can't assume all RootWindows have the same ActivationClient.
   // Add a RootWindow and its ActivationClient to the observed list.
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::const_iterator it = root_windows.begin();
        it != root_windows.end(); ++it)
     OnRootWindowAdded(*it);
 
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 ShelfWindowWatcher::~ShelfWindowWatcher() {
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {
   const ShelfItemDetails* item_details =
       GetShelfItemDetailsForWindow(window);
   ShelfItem item;
   ShelfID id = model_->next_id();
   item.status = wm::IsActiveWindow(window) ? STATUS_ACTIVE: STATUS_RUNNING;
   SetShelfItemDetailsForShelfItem(&item, *item_details);
   SetShelfIDForWindow(id, window);
@@ skipping 123 matching lines @@
         GetShelfItemDetailsForWindow(window);
     SetShelfItemDetailsForShelfItem(&item, *details);
     model_->Set(index, item);
     return;
   }
 
   // Creates a new ShelfItem for |window|.
   AddShelfItem(window);
 }
 
-void ShelfWindowWatcher::OnDisplayAdded(const gfx::Display& new_display) {
+void ShelfWindowWatcher::OnDisplayAdded(const display::Display& new_display) {
   // Add a new RootWindow and its ActivationClient to observed list.
   aura::Window* root_window = Shell::GetInstance()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(new_display.id());
 
   // When the primary root window's display get removed, the existing root
   // window is taken over by the new display and the observer is already set.
   if (!observed_root_windows_.IsObserving(root_window))
     OnRootWindowAdded(root_window);
 }
 
-void ShelfWindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
+void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
   // When this is called, RootWindow of |old_display| is already removed.
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
-void ShelfWindowWatcher::OnDisplayMetricsChanged(const gfx::Display&,
-                                                 uint32_t) {
-}
+void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
+                                                 uint32_t) {}
 
 }  // namespace ash