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

ash/display/resolution_notification_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/display/resolution_notification_controller.h"
 
 #include <utility>
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 
 using message_center::Notification;
 
 namespace ash {
 namespace {
 
 bool g_use_timer = true;
@@ skipping 102 matching lines @@
     int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback)
     : display_id(display_id),
       old_resolution(old_resolution),
       new_resolution(new_resolution),
       accept_callback(accept_callback),
       timeout_count(0) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  if (!gfx::Display::HasInternalDisplay() &&
+  if (!display::Display::HasInternalDisplay() &&
       display_manager->num_connected_displays() == 1u) {
     timeout_count = kTimeoutInSec;
   }
 }
 
 ResolutionNotificationController::ResolutionChangeInfo::
     ~ResolutionChangeInfo() {
 }
 
 ResolutionNotificationController::ResolutionNotificationController() {
   Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 ResolutionNotificationController::~ResolutionNotificationController() {
   Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void ResolutionNotificationController::PrepareNotification(
     int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback) {
-  DCHECK(!gfx::Display::IsInternalDisplayId(display_id));
+  DCHECK(!display::Display::IsInternalDisplayId(display_id));
   // If multiple resolution changes are invoked for the same display,
   // the original resolution for the first resolution change has to be used
   // instead of the specified |old_resolution|.
   DisplayMode original_resolution;
   if (change_info_ && change_info_->display_id == display_id) {
     DCHECK(change_info_->new_resolution.size == old_resolution.size);
     original_resolution = change_info_->old_resolution;
   }
 
   change_info_.reset(new ResolutionChangeInfo(
@@ skipping 91 matching lines @@
   if (!change_info_)
     return;
   int64_t display_id = change_info_->display_id;
   DisplayMode old_resolution = change_info_->old_resolution;
   change_info_.reset();
   Shell::GetInstance()->display_manager()->SetDisplayMode(
       display_id, old_resolution);
 }
 
 void ResolutionNotificationController::OnDisplayAdded(
-    const gfx::Display& new_display) {
-}
+    const display::Display& new_display) {}
 
 void ResolutionNotificationController::OnDisplayRemoved(
-    const gfx::Display& old_display) {
+    const display::Display& old_display) {
   if (change_info_ && change_info_->display_id == old_display.id())
     RevertResolutionChange();
 }
 
 void ResolutionNotificationController::OnDisplayMetricsChanged(
-    const gfx::Display&, uint32_t) {
-}
+    const display::Display&,
+    uint32_t) {}
 
 void ResolutionNotificationController::OnDisplayConfigurationChanged() {
   if (!change_info_)
     return;
 
   change_info_->current_resolution = Shell::GetInstance()->display_manager()->
       GetActiveModeForDisplayId(change_info_->display_id);
   CreateOrUpdateNotification(true);
   if (g_use_timer && change_info_->timeout_count > 0) {
     change_info_->timer.Start(FROM_HERE,
                               base::TimeDelta::FromSeconds(1),
                               this,
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace ash