Move Screen, its impls, DisplayObserver and DisplayChangeNotifier to ui/display

content/shell/browser/shell.h

 // 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.
 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
 #define CONTENT_SHELL_BROWSER_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ipc/ipc_channel.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
 #elif defined(USE_AURA)
 #if defined(OS_CHROMEOS)
-namespace gfx {
+
+namespace display {
 class Screen;
 }
-namespace display {
-using Screen = gfx::Screen;
-}
 
 namespace wm {
 class WMTestHelper;
 }
 #endif  // defined(OS_CHROMEOS)
 namespace views {
 class Widget;
 class ViewsDelegate;
 }
 #endif  // defined(USE_AURA)
@@ skipping 230 matching lines @@
   static base::Callback<void(Shell*)> shell_created_callback_;
 
   // True if the destructur of Shell should post a quit closure on the current
   // message loop if the destructed Shell object was the last one.
   static bool quit_message_loop_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_H_