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

Unified Diff: ui/views/touchui/touch_selection_controller_impl.cc

Issue 10795013: Rename bounds accessors to be intuitive and consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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
« no previous file with comments | « ui/views/examples/widget_example.cc ('k') | ui/views/view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/touchui/touch_selection_controller_impl.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 185fff2c3e7acf242a2d8c78566e74695588f5eb..d00be255d4a66d1d4fb40a83926ef7bee540c6f7 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -154,7 +154,7 @@ class TouchSelectionControllerImpl::SelectionHandleView : public View {
}
gfx::Point GetScreenPosition() {
- return widget_->GetClientAreaScreenBounds().origin();
+ return widget_->GetClientAreaBoundsInScreen().origin();
}
private:
@@ -231,7 +231,7 @@ class TouchSelectionControllerImpl::TouchContextMenuView
}
gfx::Point GetScreenPosition() {
- return widget_->GetClientAreaScreenBounds().origin();
+ return widget_->GetClientAreaBoundsInScreen().origin();
}
void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
@@ -413,7 +413,7 @@ void TouchSelectionControllerImpl::SelectionHandleDragged(
void TouchSelectionControllerImpl::ConvertPointToClientView(
SelectionHandleView* source, gfx::Point* point) {
View::ConvertPointToScreen(source, point);
- gfx::Rect r = client_view_->GetWidget()->GetClientAreaScreenBounds();
+ gfx::Rect r = client_view_->GetWidget()->GetClientAreaBoundsInScreen();
point->SetPoint(point->x() - r.x(), point->y() - r.y());
View::ConvertPointFromWidget(client_view_, point);
}
« no previous file with comments | « ui/views/examples/widget_example.cc ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698