Rename bounds accessors to be intuitive and consistent

ui/views/touchui/touch_selection_controller_impl.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 "ui/views/touchui/touch_selection_controller_impl.h"
 
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
@@ skipping 136 matching lines @@
   }
 
   void SetScreenPosition(const gfx::Point& position) {
     gfx::Rect widget_bounds(position.x() - kSelectionHandleRadius, position.y(),
         2 * kSelectionHandleRadius,
         2 * kSelectionHandleRadius + kSelectionHandleCursorHeight);
     widget_->SetBounds(widget_bounds);
   }
 
   gfx::Point GetScreenPosition() {
-    return widget_->GetClientAreaScreenBounds().origin();
+    return widget_->GetClientAreaBoundsInScreen().origin();
   }
 
  private:
   scoped_ptr<Widget> widget_;
   TouchSelectionControllerImpl* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectionHandleView);
 };
 
 class ContextMenuButtonBackground : public Background {
@@ skipping 56 matching lines @@
         widget_->Hide();
     }
     View::SetVisible(visible);
   }
 
   void SetScreenPosition(const gfx::Point& position) {
     RefreshButtonsAndSetWidgetPosition(position);
   }
 
   gfx::Point GetScreenPosition() {
-    return widget_->GetClientAreaScreenBounds().origin();
+    return widget_->GetClientAreaBoundsInScreen().origin();
   }
 
   void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
     // TODO(varunjain): the following color scheme is copied from
     // menu_scroll_view_container.cc. Figure out how to consolidate the two
     // pieces of code.
 #if defined(OS_CHROMEOS)
     static const SkColor kGradientColors[2] = {
         SK_ColorWHITE,
         SkColorSetRGB(0xF0, 0xF0, 0xF0)
@@ skipping 161 matching lines @@
     // Instruct client_view to select the region between p1 and p2. The position
     // of |fixed_handle| is the start and that of |dragging_handle| is the end
     // of selection.
     client_view_->SelectRect(p2, p1);
   }
 }
 
 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);
 }
 
 bool TouchSelectionControllerImpl::IsCommandIdEnabled(int command_id) const {
   return client_view_->IsCommandIdEnabled(command_id);
 }
 
 void TouchSelectionControllerImpl::ExecuteCommand(int command_id) {
   HideContextMenu();
@@ skipping 61 matching lines @@
 bool TouchSelectionControllerImpl::IsSelectionHandle2Visible() {
   return selection_handle_2_->visible();
 }
 
 TouchSelectionController* TouchSelectionController::create(
     TouchSelectionClientView* client_view) {
   return new TouchSelectionControllerImpl(client_view);
 }
 
 }  // namespace views