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

ash/system/audio/tray_audio.h

 // 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.
 
 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/tray/tray_image_item.h"
 #include "base/macros.h"
-#include "ui/gfx/display_observer.h"
+#include "ui/display/display_observer.h"
 
 namespace ash {
 
 namespace system {
 class TrayAudioDelegate;
 }
 
 namespace tray {
 class VolumeView;
 }
 
 class TrayAudio : public TrayImageItem,
                   public AudioObserver,
-                  public gfx::DisplayObserver {
+                  public display::DisplayObserver {
  public:
   TrayAudio(SystemTray* system_tray,
             std::unique_ptr<system::TrayAudioDelegate> audio_delegate);
   ~TrayAudio() override;
 
   static bool ShowAudioDeviceMenu();
 
  protected:
-  // Overridden from gfx::DisplayObserver.
-  void OnDisplayAdded(const gfx::Display& new_display) override;
-  void OnDisplayRemoved(const gfx::Display& old_display) override;
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // Overridden from display::DisplayObserver.
+  void OnDisplayAdded(const display::Display& new_display) override;
+  void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t changed_metrics) override;
 
   virtual void Update();
 
   std::unique_ptr<system::TrayAudioDelegate> audio_delegate_;
   tray::VolumeView* volume_view_;
 
   // True if VolumeView should be created for accelerator pop up;
   // Otherwise, it should be created for detailed view in ash tray bubble.
   bool pop_up_volume_view_;
@@ skipping 18 matching lines @@
   void OnActiveInputNodeChanged() override;
 
   void ChangeInternalSpeakerChannelMode();
 
   DISALLOW_COPY_AND_ASSIGN(TrayAudio);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_