Start to decouple display::Display from ws::PlatformDisplay.

services/ui/ws/window_manager_state.cc

 // Copyright 2016 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 "services/ui/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 612 matching lines @@
   }
   DCHECK(tree);
   return tree->id();
 }
 
 ServerWindow* WindowManagerState::GetRootWindowContaining(
     gfx::Point* location) {
   if (window_manager_display_roots_.empty())
     return nullptr;
 
+  // TODO(riajiang): This is broken for HDPI because it mixes PPs and DIPs. See
+  // http://crbug.com/701036 for details.
   WindowManagerDisplayRoot* target_display_root = nullptr;
   for (auto& display_root_ptr : window_manager_display_roots_) {
-    if (display_root_ptr->display()->platform_display()->GetBounds().Contains(
+    if (display_root_ptr->display()->GetDisplay().bounds().Contains(
             *location)) {
       target_display_root = display_root_ptr.get();
       break;
     }
   }
 
   // TODO(kylechar): Better handle locations outside the window. Overlapping X11
   // windows, dragging and touch sensors need to be handled properly.
   if (!target_display_root) {
     DVLOG(1) << "Invalid event location " << location->ToString();
     target_display_root = window_manager_display_roots_.begin()->get();
   }
 
   // Translate the location to be relative to the display instead of relative
   // to the screen space.
   gfx::Point origin =
-      target_display_root->display()->platform_display()->GetBounds().origin();
+      target_display_root->display()->GetDisplay().bounds().origin();
   *location -= origin.OffsetFromOrigin();
   return target_display_root->root();
 }
 
 void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
   window_server()->SendToPointerWatchers(event, user_id(), nullptr, /* window */
                                          nullptr /* ignore_tree */,
                                          event_processing_display_id_);
   if (event.IsMousePointerEvent())
     UpdateNativeCursorFromDispatcher();
 }
 
 void WindowManagerState::OnWindowEmbeddedAppDisconnected(ServerWindow* window) {
   for (auto iter = orphaned_window_manager_display_roots_.begin();
        iter != orphaned_window_manager_display_roots_.end(); ++iter) {
     if ((*iter)->root() == window) {
       window->RemoveObserver(this);
       orphaned_window_manager_display_roots_.erase(iter);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace ws
 }  // namespace ui