Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5909)

Unified Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

Issue 10828265: Replace views::LocatedEvent with ui::LocatedEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
===================================================================
--- chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc (revision 151267)
+++ chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc (working copy)
@@ -237,7 +237,7 @@
if (hit_test == HTCLIENT && !frame()->IsMaximized()) {
// Convert point to client coordinates.
gfx::Point client_point(point);
- View::ConvertPointToView(this, frame()->client_view(), &client_point);
+ View::ConvertPointToTarget(this, frame()->client_view(), &client_point);
// Report hits in shadow at top of tabstrip as caption.
gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
if (client_point.y() < tabstrip_bounds.y() + tab_shadow_height())
@@ -342,18 +342,18 @@
return false;
gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
gfx::Point tabstrip_origin(tabstrip_bounds.origin());
- View::ConvertPointToView(frame()->client_view(), this, &tabstrip_origin);
+ View::ConvertPointToTarget(frame()->client_view(), this, &tabstrip_origin);
tabstrip_bounds.set_origin(tabstrip_origin);
if (rect.bottom() > tabstrip_bounds.bottom())
return false;
// We convert from our parent's coordinates since we assume we fill its bounds
// completely. We need to do this since we're not a parent of the tabstrip,
- // meaning ConvertPointToView would otherwise return something bogus.
+ // meaning ConvertPointToTarget would otherwise return something bogus.
// TODO(tdanderson): Initialize |browser_view_point| using |rect| instead of
// its center point once GetEventHandlerForRect() is implemented.
gfx::Point browser_view_point(rect.CenterPoint());
- View::ConvertPointToView(parent(), browser_view(), &browser_view_point);
+ View::ConvertPointToTarget(parent(), browser_view(), &browser_view_point);
return browser_view()->IsPositionInWindowCaption(browser_view_point);
}
@@ -497,7 +497,7 @@
if (toolbar_bounds.IsEmpty())
return;
gfx::Point toolbar_origin(toolbar_bounds.origin());
- ConvertPointToView(browser_view(), this, &toolbar_origin);
+ View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
toolbar_bounds.set_origin(toolbar_origin);
int x = toolbar_bounds.x();

Powered by Google App Engine
This is Rietveld 408576698