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

ui/message_center/views/message_popup_collection.h

 // Copyright (c) 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.
 
 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 14 matching lines @@
 namespace base {
 class RunLoop;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace gfx {
 class Display;
-class Screen;
+}
+
+namespace display {
+using Display = gfx::Display;
 }
 
 namespace message_center {
 namespace test {
 class MessagePopupCollectionTest;
 }
 
 class MessageCenter;
 class MessageCenterTray;
 class MessageViewContextMenuController;
@@ skipping 46 matching lines @@
 
   // Runs the next step in update/animate sequence, if the defer counter is not
   // zero. Otherwise, simply waits when it becomes zero.
   void DoUpdateIfPossible();
 
   // Removes the toast from our internal list of toasts; this is called when the
   // toast is irrevocably closed (such as within RemoveToast).
   void ForgetToast(ToastContentsView* toast);
 
   // Called when the display bounds has been changed. Used in Windows only.
-  void OnDisplayMetricsChanged(const gfx::Display& display);
+  void OnDisplayMetricsChanged(const display::Display& display);
 
   // Used by ToastContentsView to locate itself.
   gfx::NativeView parent() const { return parent_; }
 
  private:
   friend class test::MessagePopupCollectionTest;
   typedef std::list<ToastContentsView*> Toasts;
 
   // Iterates toasts and starts closing them.
   std::set<std::string> CloseAllWidgets();
@@ skipping 69 matching lines @@
   // Gives out weak pointers to toast contents views which have an unrelated
   // lifetime.  Must remain the last member variable.
   base::WeakPtrFactory<MessagePopupCollection> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePopupCollection);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_