Rename bounds accessors to be intuitive and consistent

ui/views/controls/scrollbar/base_scroll_bar.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/controls/scrollbar/base_scroll_bar.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 201 matching lines @@
   ScrollBarContextMenuCommand_ScrollStart,
   ScrollBarContextMenuCommand_ScrollEnd,
   ScrollBarContextMenuCommand_ScrollPageUp,
   ScrollBarContextMenuCommand_ScrollPageDown,
   ScrollBarContextMenuCommand_ScrollPrev,
   ScrollBarContextMenuCommand_ScrollNext
 };
 
 void BaseScrollBar::ShowContextMenuForView(View* source, const gfx::Point& p) {
   Widget* widget = GetWidget();
-  gfx::Rect widget_bounds = widget->GetWindowScreenBounds();
+  gfx::Rect widget_bounds = widget->GetWindowBoundsInScreen();
   gfx::Point temp_pt(p.x() - widget_bounds.x(), p.y() - widget_bounds.y());
   View::ConvertPointFromWidget(this, &temp_pt);
   context_menu_mouse_position_ = IsHorizontal() ? temp_pt.x() : temp_pt.y();
 
   views::MenuItemView* menu = new views::MenuItemView(this);
   // MenuRunner takes ownership of |menu|.
   menu_runner_.reset(new MenuRunner(menu));
   menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollHere);
   menu->AppendSeparator();
   menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollStart);
@@ skipping 189 matching lines @@
     thumb_position = thumb_position - (thumb_->GetSize() / 2);
   return (thumb_position * contents_size_) / GetTrackSize();
 }
 
 void BaseScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
   thumb_track_state_ = state;
   SchedulePaint();
 }
 
 }  // namespace views