Rename bounds accessors to be intuitive and consistent

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 351 matching lines @@
   // Separator between the maximize and close buttons.  It overlaps the left
   // edge of the close button.
   canvas->DrawImageInt(*button_separator_,
                        close_button_->x(),
                        close_button_->y());
 
   // We don't need the extra lightness in the edges when we're at the top edge
   // of the screen.
   // TODO(oshima): This will not work under multi-display, need to add method
   // like GetWindowBoundsInDisplay().
-  if (frame_->GetWindowScreenBounds().y() == 0)
+  if (frame_->GetWindowBoundsInScreen().y() == 0)
     return;
 
   // Draw the top corners and edge.
   int top_left_height = top_left_corner_->height();
   canvas->DrawImageInt(*top_left_corner_,
                        0, 0, top_left_corner_->width(), top_left_height,
                        0, 0, top_left_corner_->width(), top_left_height,
                        false);
   canvas->TileImageInt(*top_edge_,
       top_left_corner_->width(),
@@ skipping 233 matching lines @@
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     FramePainter* painter = *it;
     if (IsVisibleNormalWindow(painter->window_))
       painter->frame_->non_client_view()->SchedulePaint();
   }
 }
 
 }  // namespace ash