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

ash/system/tray/system_tray.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 "ash/system/tray/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 14 matching lines @@
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/tray_user_separator.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
+#include "ui/display/screen.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/audio/tray_audio_chromeos.h"
 #include "ash/system/chromeos/brightness/tray_brightness.h"
@@ skipping 309 matching lines @@
   return ((system_bubble_.get() &&
            system_bubble_->bubble()->IsVisible()) ||
           (notification_bubble_.get() &&
            notification_bubble_->bubble()->IsVisible()));
 }
 
 bool SystemTray::IsMouseInNotificationBubble() const {
   if (!notification_bubble_)
     return false;
   return notification_bubble_->bubble_view()->GetBoundsInScreen().Contains(
-      gfx::Screen::GetScreen()->GetCursorScreenPoint());
+      display::Screen::GetScreen()->GetCursorScreenPoint());
 }
 
 bool SystemTray::CloseSystemBubble() const {
   if (!system_bubble_)
     return false;
   system_bubble_->bubble()->Close();
   return true;
 }
 
 views::View* SystemTray::GetHelpButtonView() const {
@@ skipping 209 matching lines @@
 void SystemTray::UpdateWebNotifications() {
   TrayBubbleView* bubble_view = NULL;
   if (notification_bubble_)
     bubble_view = notification_bubble_->bubble_view();
   else if (system_bubble_)
     bubble_view = system_bubble_->bubble_view();
 
   int height = 0;
   if (bubble_view) {
     gfx::Rect work_area =
-        gfx::Screen::GetScreen()
+        display::Screen::GetScreen()
             ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
             .work_area();
     height =
         std::max(0, work_area.height() - bubble_view->GetBoundsInScreen().y());
   }
   status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
 }
 
 base::string16 SystemTray::GetAccessibleTimeString(
     const base::Time& now) const {
@@ skipping 119 matching lines @@
   system_bubble_.reset();
   // When closing a system bubble with the alternate shelf layout, we need to
   // turn off the active tinting of the shelf.
   if (full_system_tray_menu_) {
     SetDrawBackgroundAsActive(false);
     full_system_tray_menu_ = false;
   }
 }
 
 }  // namespace ash