From dac8ee8b179eb2d035c6463d722976ea6fdccee9 Mon Sep 17 00:00:00 2001
From: fwang <fwang@igalia.com>
Date: Mon, 6 Feb 2017 09:41:15 -0800
Subject: [PATCH] Small improvements of header inclusion for ws/display.h

This CL removes some inclusions of ws/display.h that are actually not
necessary or can just be replaced with a pre-declaration of ws::Display.

BUG=None

Review-Url: https://codereview.chromium.org/2679643002
Cr-Commit-Position: refs/heads/master@{#448289}
---
 services/ui/service.cc                        | 1 -
 services/ui/ws/display_binding.h              | 2 +-
 services/ui/ws/event_dispatcher.cc            | 1 -
 services/ui/ws/window_manager_display_root.cc | 1 +
 services/ui/ws/window_manager_state.cc        | 1 +
 services/ui/ws/window_manager_state.h         | 1 +
 services/ui/ws/window_server.h                | 2 +-
 7 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/ui/service.cc b/services/ui/service.cc
index 95d179144322b1..5e9fab6dc5e9bb 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -29,7 +29,6 @@
 #include "services/ui/ime/ime_registrar_impl.h"
 #include "services/ui/ime/ime_server_impl.h"
 #include "services/ui/ws/accessibility_manager.h"
-#include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/gpu_host.h"
diff --git a/services/ui/ws/display_binding.h b/services/ui/ws/display_binding.h
index 671e74dc9571a0..647e0f4cc748f4 100644
--- a/services/ui/ws/display_binding.h
+++ b/services/ui/ws/display_binding.h
@@ -10,12 +10,12 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
-#include "services/ui/ws/display.h"
 #include "services/ui/ws/user_id.h"
 
 namespace ui {
 namespace ws {
 
+class Display;
 class ServerWindow;
 class WindowServer;
 class WindowTree;
diff --git a/services/ui/ws/event_dispatcher.cc b/services/ui/ws/event_dispatcher.cc
index f045ac63d74f2a..c592a64551eec2 100644
--- a/services/ui/ws/event_dispatcher.cc
+++ b/services/ui/ws/event_dispatcher.cc
@@ -9,7 +9,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/ui/ws/accelerator.h"
-#include "services/ui/ws/display.h"
 #include "services/ui/ws/drag_controller.h"
 #include "services/ui/ws/drag_source.h"
 #include "services/ui/ws/event_dispatcher_delegate.h"
diff --git a/services/ui/ws/window_manager_display_root.cc b/services/ui/ws/window_manager_display_root.cc
index 03c69f883f642f..c9486fcaafca2d 100644
--- a/services/ui/ws/window_manager_display_root.cc
+++ b/services/ui/ws/window_manager_display_root.cc
@@ -4,6 +4,7 @@
 
 #include "services/ui/ws/window_manager_display_root.h"
 
+#include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/window_server.h"
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index 028e06c9c898bf..d1725e8c549ddf 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -10,6 +10,7 @@
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/ws/accelerator.h"
+#include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
diff --git a/services/ui/ws/window_manager_state.h b/services/ui/ws/window_manager_state.h
index 0e04d0bec8bfe5..88f09215f749c4 100644
--- a/services/ui/ws/window_manager_state.h
+++ b/services/ui/ws/window_manager_state.h
@@ -24,6 +24,7 @@ namespace ui {
 namespace ws {
 
 class DisplayManager;
+class PlatformDisplay;
 class WindowManagerDisplayRoot;
 class WindowTree;
 
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index 709cf9e0540302..17c15011997546 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -18,7 +18,6 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/ui/ws/display.h"
 #include "services/ui/ws/gpu_host_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/operation.h"
@@ -33,6 +32,7 @@ namespace ui {
 namespace ws {
 
 class AccessPolicy;
+class Display;
 class DisplayManager;
 class GpuHost;
 class ServerWindow;