Cleanup for views::Label:

chrome/browser/ui/views/about_chrome_view.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 "chrome/browser/ui/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 238 matching lines @@
   SkColor background_color = color_utils::GetSysSkColor(COLOR_3DFACE);
   copyright_label_->SetBackgroundColor(background_color);
   main_text_label_->SetBackgroundColor(background_color);
   chromium_url_->SetBackgroundColor(background_color);
   open_source_url_->SetBackgroundColor(background_color);
 #endif
 
   // Add together all the strings in the dialog for the purpose of calculating
   // the height of the dialog. The space for the Terms of Service string is not
   // included (it is added later, if needed).
-  string16 full_text = main_label_chunk1_ + chromium_url_->GetText() +
-                       main_label_chunk2_ + open_source_url_->GetText() +
+  string16 full_text = main_label_chunk1_ + chromium_url_->text() +
+                       main_label_chunk2_ + open_source_url_->text() +
                        main_label_chunk3_;
 
   dialog_dimensions_ = views::Widget::GetLocalizedContentsSize(
       IDS_ABOUT_DIALOG_WIDTH_CHARS,
       IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES);
 
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
   gfx::Font font =
@@ skipping 509 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 int AboutChromeView::EnlargeWindowSizeIfNeeded() {
-  if (!error_label_ || error_label_->GetText().empty())
+  if (!error_label_ || error_label_->text().empty())
     return 0;
 
   // This will enlarge the window each time the function is called, which is
   // fine since we only receive status once from Google Update.
   gfx::Rect window_rect = GetWidget()->GetWindowScreenBounds();
   int height = error_label_->GetHeightForWidth(
       dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) +
           views::kRelatedControlVerticalSpacing;
   window_rect.set_height(window_rect.height() + height);
   GetWidget()->SetBounds(window_rect);
 
   return height;
 }
 
 #endif