Fix root ServerWindow size.

services/ui/ws/display.cc

 // Copyright 2015 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/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 276 matching lines @@
           window_server_->user_id_tracker()->active_id())
       ->OnUserActivity();
 }
 
 void Display::OnNativeCaptureLost() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
   if (display_root)
     display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId);
 }
 
-void Display::OnViewportMetricsChanged(
-    const display::ViewportMetrics& new_metrics) {
-  if (!root_ || root_->bounds().size() == new_metrics.bounds.size())
+void Display::UpdateRootWindowSize(const gfx::Size& new_size) {
+  if (root_->bounds().size() == new_size)
     return;
 
-  gfx::Rect new_bounds(new_metrics.bounds.size());
+  gfx::Rect new_bounds(new_size);
   root_->SetBounds(new_bounds);
   for (auto& pair : window_manager_display_root_map_)
     pair.second->root()->SetBounds(new_bounds);
 }
 
 bool Display::CanHaveActiveChildren(ServerWindow* window) const {
   return window && activation_parents_.Contains(window);
 }
 
 void Display::OnActivationChanged(ServerWindow* old_active_window,
@@ skipping 70 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui