Variety of tweaks to View API.

chrome/browser/speech/speech_input_bubble_views.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 "chrome/browser/speech/speech_input_bubble.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 114 matching lines @@
   try_again_->SetVisible(is_message);
   cancel_->SetVisible(mode != SpeechInputBubbleBase::DISPLAY_MODE_WARM_UP);
   heading_->SetVisible(mode == SpeechInputBubbleBase::DISPLAY_MODE_RECORDING);
 
   if (is_message) {
     message_->SetText(UTF16ToWideHack(message_text));
   } else {
     SetImage(image);
   }
 
-  if (icon_->IsVisible())
+  if (icon_->visible())
     icon_->ResetImageSize();
 
   // When moving from warming up to recording state, the size of the content
   // stays the same. So we wouldn't get a resize/layout call from the view
   // system and we do it ourselves.
   if (GetPreferredSize() == size())  // |size()| here is the current size.
     Layout();
 }
 
 void ContentView::SetImage(const SkBitmap& image) {
@@ skipping 12 matching lines @@
 }
 
 void ContentView::LinkClicked(views::Link* source, int event_flags) {
   DCHECK_EQ(source, mic_settings_);
   AudioManager::GetAudioManager()->ShowAudioInputSettings();
 }
 
 gfx::Size ContentView::GetPreferredSize() {
   int width = heading_->GetPreferredSize().width();
   int control_width = cancel_->GetPreferredSize().width();
-  if (try_again_->IsVisible()) {
+  if (try_again_->visible()) {
     control_width += try_again_->GetPreferredSize().width() +
                      views::kRelatedButtonHSpacing;
   }
   width = std::max(width, control_width);
   control_width = std::max(icon_->GetPreferredSize().width(),
                            kIconLayoutMinWidth);
   width = std::max(width, control_width);
-  if (mic_settings_->IsVisible()) {
+  if (mic_settings_->visible()) {
     control_width = mic_settings_->GetPreferredSize().width();
     width = std::max(width, control_width);
   }
 
   int height = cancel_->GetPreferredSize().height();
-  if (message_->IsVisible()) {
+  if (message_->visible()) {
     height += message_->GetHeightForWidth(width) +
               views::kLabelToControlVerticalSpacing;
   }
-  if (heading_->IsVisible())
+  if (heading_->visible())
     height += heading_->GetPreferredSize().height();
-  if (icon_->IsVisible())
+  if (icon_->visible())
     height += icon_->GetImage().height();
-  if (mic_settings_->IsVisible())
+  if (mic_settings_->visible())
     height += mic_settings_->GetPreferredSize().height();
   width += kBubbleHorizMargin * 2;
   height += kBubbleVertMargin * 2;
 
   return gfx::Size(width, height);
 }
 
 void ContentView::Layout() {
   int x = kBubbleHorizMargin;
   int y = kBubbleVertMargin;
   int available_width = width() - kBubbleHorizMargin * 2;
   int available_height = height() - kBubbleVertMargin * 2;
 
-  if (message_->IsVisible()) {
-    DCHECK(try_again_->IsVisible());
+  if (message_->visible()) {
+    DCHECK(try_again_->visible());
 
     int control_height = try_again_->GetPreferredSize().height();
     int try_again_width = try_again_->GetPreferredSize().width();
     int cancel_width = cancel_->GetPreferredSize().width();
     y += available_height - control_height;
     x += (available_width - cancel_width - try_again_width -
           views::kRelatedButtonHSpacing) / 2;
     try_again_->SetBounds(x, y, try_again_width, control_height);
     cancel_->SetBounds(x + try_again_width + views::kRelatedButtonHSpacing, y,
                        cancel_width, control_height);
 
     control_height = message_->GetHeightForWidth(available_width);
     message_->SetBounds(kBubbleHorizMargin, kBubbleVertMargin,
                         available_width, control_height);
     y = kBubbleVertMargin + control_height;
 
     control_height = mic_settings_->GetPreferredSize().height();
     mic_settings_->SetBounds(kBubbleHorizMargin, y, available_width,
                              control_height);
   } else {
-    DCHECK(icon_->IsVisible());
+    DCHECK(icon_->visible());
 
     int control_height = icon_->GetImage().height();
     if (display_mode_ == SpeechInputBubbleBase::DISPLAY_MODE_WARM_UP)
       y = (available_height - control_height) / 2;
     icon_->SetBounds(x, y, available_width, control_height);
     y += control_height;
 
-    if (heading_->IsVisible()) {
+    if (heading_->visible()) {
       control_height = heading_->GetPreferredSize().height();
       heading_->SetBounds(x, y, available_width, control_height);
       y += control_height;
     }
 
-    if (cancel_->IsVisible()) {
+    if (cancel_->visible()) {
       control_height = cancel_->GetPreferredSize().height();
       int width = cancel_->GetPreferredSize().width();
       cancel_->SetBounds(x + (available_width - width) / 2, y, width,
                          control_height);
     }
   }
 }
 
 // Implementation of SpeechInputBubble.
 class SpeechInputBubbleImpl
@@ skipping 120 matching lines @@
 }
 
 }  // namespace
 
 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(
     TabContents* tab_contents,
     SpeechInputBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechInputBubbleImpl(tab_contents, delegate, element_rect);
 }