Add support for rect-based event targeting in views

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

 // Copyright (c) 2012 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/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_painter.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 274 matching lines @@
 const char* BrowserNonClientFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
 bool BrowserNonClientFrameViewAsh::HitTestRect(const gfx::Rect& rect) const {
   if (!views::View::HitTestRect(rect)) {
     // |rect| is outside BrowserNonClientFrameViewAsh's bounds.
     return false;
   }
   // If the rect is outside the bounds of the client area, claim it.
-  // TODO(tdanderson): Implement View::ConvertRectToTarget().
-  gfx::Point rect_in_client_view_coords_origin(rect.origin());
-  View::ConvertPointToTarget(this, frame()->client_view(),
-      &rect_in_client_view_coords_origin);
-  gfx::Rect rect_in_client_view_coords(
-      rect_in_client_view_coords_origin, rect.size());
+  gfx::Rect rect_in_client_view_coords(rect);
+  View::ConvertRectToTarget(this, frame()->client_view(),
+      &rect_in_client_view_coords);
   if (!frame()->client_view()->HitTestRect(rect_in_client_view_coords))
     return true;
 
   // Otherwise, claim |rect| only if it is above the bottom of the tabstrip in
   // a non-tab portion.
   TabStrip* tabstrip = browser_view()->tabstrip();
   if (!tabstrip || !browser_view()->IsTabStripVisible())
     return false;
 
-  gfx::Point rect_in_tabstrip_coords_origin(rect.origin());
-  View::ConvertPointToTarget(this, tabstrip,
-      &rect_in_tabstrip_coords_origin);
-  gfx::Rect rect_in_tabstrip_coords(rect_in_tabstrip_coords_origin,
-      rect.size());
+  gfx::Rect rect_in_tabstrip_coords(rect);
+  View::ConvertRectToTarget(this, tabstrip, &rect_in_tabstrip_coords);
 
-  if (rect_in_tabstrip_coords.bottom() > tabstrip->GetLocalBounds().bottom()) {
+  if (rect_in_tabstrip_coords.y() > tabstrip->GetLocalBounds().bottom()) {
     // |rect| is below the tabstrip.
     return false;
   }
 
   if (tabstrip->HitTestRect(rect_in_tabstrip_coords)) {
     // Claim |rect| if it is in a non-tab portion of the tabstrip.
-    // TODO(tdanderson): Pass |rect_in_tabstrip_coords| instead of its center
-    // point to TabStrip::IsPositionInWindowCaption() once
-    // GetEventHandlerForRect() is implemented.
-    return tabstrip->IsPositionInWindowCaption(
-        rect_in_tabstrip_coords.CenterPoint());
+    return tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);
   }
 
   // We claim |rect| because it is above the bottom of the tabstrip, but
   // not in the tabstrip. In particular, the window controls are right of
   // the tabstrip.
   return true;
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
     ui::AccessibleViewState* state) {
@@ skipping 218 matching lines @@
 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE;
   }
   return 0;
 }