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

ash/system/audio/tray_audio.cc

 // Copyright 2014 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/audio/tray_audio.h"
 
 #include <cmath>
 #include <utility>
 
 #include "ash/ash_constants.h"
 #include "ash/display/display_manager.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/system/audio/tray_audio_delegate.h"
 #include "ash/system/audio/volume_view.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/volume_control_delegate.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/display/display.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 TrayAudio::TrayAudio(SystemTray* system_tray,
                      std::unique_ptr<system::TrayAudioDelegate> audio_delegate)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE),
       audio_delegate_(std::move(audio_delegate)),
       volume_view_(NULL),
       pop_up_volume_view_(false) {
   Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this);
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 TrayAudio::~TrayAudio() {
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
   Shell::GetInstance()->system_tray_notifier()->RemoveAudioObserver(this);
 }
 
 // static
 bool TrayAudio::ShowAudioDeviceMenu() {
 #if defined(OS_CHROMEOS)
   return true;
 #else
   return false;
 #endif
@@ skipping 70 matching lines @@
 }
 
 void TrayAudio::OnActiveInputNodeChanged() {
   Update();
 }
 
 void TrayAudio::ChangeInternalSpeakerChannelMode() {
   // Swap left/right channel only if it is in Yoga mode.
   system::TrayAudioDelegate::AudioChannelMode channel_mode =
       system::TrayAudioDelegate::NORMAL;
-  if (gfx::Display::HasInternalDisplay()) {
+  if (display::Display::HasInternalDisplay()) {
     const DisplayInfo& display_info =
         Shell::GetInstance()->display_manager()->GetDisplayInfo(
-            gfx::Display::InternalDisplayId());
-    if (display_info.GetActiveRotation() == gfx::Display::ROTATE_180)
+            display::Display::InternalDisplayId());
+    if (display_info.GetActiveRotation() == display::Display::ROTATE_180)
       channel_mode = system::TrayAudioDelegate::LEFT_RIGHT_SWAPPED;
   }
 
   audio_delegate_->SetInternalSpeakerChannelMode(channel_mode);
 }
 
-void TrayAudio::OnDisplayAdded(const gfx::Display& new_display) {
+void TrayAudio::OnDisplayAdded(const display::Display& new_display) {
   if (!new_display.IsInternal())
     return;
   ChangeInternalSpeakerChannelMode();
 }
 
-void TrayAudio::OnDisplayRemoved(const gfx::Display& old_display) {
+void TrayAudio::OnDisplayRemoved(const display::Display& old_display) {
   if (!old_display.IsInternal())
     return;
   ChangeInternalSpeakerChannelMode();
 }
 
-void TrayAudio::OnDisplayMetricsChanged(const gfx::Display& display,
+void TrayAudio::OnDisplayMetricsChanged(const display::Display& display,
                                         uint32_t changed_metrics) {
   if (!display.IsInternal())
     return;
 
-  if (changed_metrics & gfx::DisplayObserver::DISPLAY_METRIC_ROTATION)
+  if (changed_metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
     ChangeInternalSpeakerChannelMode();
 }
 
 void TrayAudio::Update() {
   if (tray_view())
       tray_view()->SetVisible(GetInitialVisibility());
   if (volume_view_) {
     volume_view_->SetVolumeLevel(
         static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
     volume_view_->Update();
   }
 }
 
 }  // namespace ash