Cleanup adding BoundsInWidget to View to convert callers...

chrome/views/hwnd_view.cc

 // Copyright (c) 2006-2008 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 "chrome/views/hwnd_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/scroll_view.h"
@@ skipping 52 matching lines @@
 }
 
 void HWNDView::UpdateHWNDBounds() {
   if (!hwnd_)
     return;
 
   // Since HWNDs know nothing about the View hierarchy (they are direct
   // children of the Widget that hosts our View hierarchy) they need to be
   // positioned in the coordinate system of the Widget, not the current
   // view.
-  gfx::Point top_left;
-  ConvertPointToWidget(this, &top_left);
+  gfx::Rect widget_bounds = BoundsInWidget();
 
   gfx::Rect vis_bounds = GetVisibleBounds();
   bool visible = !vis_bounds.IsEmpty();
 
   if (visible && !fast_resize_) {
     if (vis_bounds.size() != size()) {
       // Only a portion of the HWND is really visible.
       int x = vis_bounds.x();
       int y = vis_bounds.y();
       HRGN clip_region = CreateRectRgn(x, y, x + vis_bounds.width(),
@@ skipping 18 matching lines @@
                 SWP_NOOWNERZORDER |
                 SWP_NOZORDER;
     // Only send the SHOWWINDOW flag if we're invisible, to avoid flashing.
     if (!::IsWindowVisible(hwnd_))
       swp_flags = (swp_flags | SWP_SHOWWINDOW) & ~SWP_NOREDRAW;
 
     if (fast_resize_) {
       // In a fast resize, we move the window and clip it with SetWindowRgn.
       CRect rect;
       GetWindowRect(hwnd_, &rect);
-      ::SetWindowPos(hwnd_, 0, top_left.x(), top_left.y(), rect.Width(),
-                     rect.Height(), swp_flags);
+      ::SetWindowPos(hwnd_, 0, widget_bounds.x(), widget_bounds.y(), 
+                     rect.Width(), rect.Height(), swp_flags);
 
       HRGN clip_region = CreateRectRgn(0, 0, width(), height());
       SetWindowRgn(hwnd_, clip_region, FALSE);
       installed_clip_ = true;
     } else {
-      ::SetWindowPos(hwnd_, 0, top_left.x(), top_left.y(), width(), height(),
-                     swp_flags);
+      ::SetWindowPos(hwnd_, 0, widget_bounds.x(), widget_bounds.y(), width(), 
+                     height(), swp_flags);
     }
   } else if (::IsWindowVisible(hwnd_)) {
     // The window is currently visible, but its clipped by another view. Hide
     // it.
     ::SetWindowPos(hwnd_, 0, 0, 0, 0, 0,
                    SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER |
                    SWP_NOREDRAW | SWP_NOOWNERZORDER );
   }
 }
 
@@ skipping 52 matching lines @@
   if (installed_clip_)
     canvas->FillRectInt(SkColorSetRGB(255, 255, 255), 0, 0, width(), height());
 }
 
 std::string HWNDView::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views