exo: Fix surface origin offset.

components/exo/shell_surface.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 "components/exo/shell_surface.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 879 matching lines @@
   return resizer_->details().bounds_change &
          ash::WindowResizer::kBoundsChange_Resizes;
 }
 
 gfx::Rect ShellSurface::GetVisibleBounds() const {
   // Use |geometry_| if set, otherwise use the visual bounds of the surface.
   return geometry_.IsEmpty() ? gfx::Rect(surface_->layer()->size()) : geometry_;
 }
 
 gfx::Point ShellSurface::GetSurfaceOrigin() const {
-  gfx::Rect window_bounds = widget_->GetWindowBoundsInScreen();
+  gfx::Rect window_bounds = widget_->GetNativeWindow()->bounds();
 
   // If initial bounds were specified then surface origin is always relative
   // to those bounds.
   if (!initial_bounds_.IsEmpty())
     return initial_bounds_.origin() - window_bounds.OffsetFromOrigin();
 
   gfx::Rect visible_bounds = GetVisibleBounds();
   switch (resize_component_) {
     case HTCAPTION:
       return origin_ - visible_bounds.OffsetFromOrigin();
@@ skipping 52 matching lines @@
   DCHECK(!ignore_window_bounds_changes_);
   ignore_window_bounds_changes_ = true;
   widget_->SetBounds(new_widget_bounds);
   ignore_window_bounds_changes_ = false;
 
   // A change to the widget size requires surface bounds to be re-adjusted.
   surface_->SetBounds(gfx::Rect(GetSurfaceOrigin(), surface_->layer()->size()));
 }
 
 }  // namespace exo