Variety of tweaks to View API.

views/controls/label.cc

 // Copyright (c) 2011 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 "views/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 168 matching lines @@
 int Label::GetBaseline() {
   return GetInsets().top() + font_.GetBaseline();
 }
 
 gfx::Size Label::GetPreferredSize() {
   // Return a size of (0, 0) if the label is not visible and if the
   // collapse_when_hidden_ flag is set.
   // TODO(munjal): This logic probably belongs to the View class. But for now,
   // put it here since putting it in View class means all inheriting classes
   // need ot respect the collapse_when_hidden_ flag.
-  if (!IsVisible() && collapse_when_hidden_)
+  if (!visible() && collapse_when_hidden_)
     return gfx::Size();
 
   gfx::Size prefsize(GetTextSize());
   gfx::Insets insets = GetInsets();
   prefsize.Enlarge(insets.width(), insets.height());
   return prefsize;
 }
 
 int Label::GetHeightForWidth(int w) {
   if (!is_multi_line_)
@@ skipping 254 matching lines @@
         font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = UTF16ToWideHack(text_);
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views