Cleanup for views::Label:

chrome/browser/chromeos/status/status_area_bubble.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/chromeos/status/status_area_bubble.h"
 
 #include "chrome/browser/ui/views/window.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
@@ skipping 22 matching lines @@
                                         kPadX, kPadY, kTextPadX));
   AddChildView(icon_view_);
   message_view_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(message_view_);
 }
 
 StatusAreaBubbleContentView::~StatusAreaBubbleContentView() {
 }
 
 string16 StatusAreaBubbleContentView::GetMessage() const {
-  return message_view_->GetText();
+  return message_view_->text();
 }
 
 void StatusAreaBubbleContentView::SetMessage(const string16& message) {
   message_view_->SetText(message);
 }
 
 void StatusAreaBubbleContentView::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_STATICTEXT;
   state->state = ui::AccessibilityTypes::STATE_READONLY;
@@ skipping 74 matching lines @@
   timer_.Stop();  // no-op if it's not running.
 
   // Instead of setting |bubble_| NULL in OnWidgetClosing, do it here because
   // |this| may be deleted when OnWidgetClosing is called.
   bubble_->GetWidget()->RemoveObserver(this);
   bubble_->GetWidget()->Close();
   bubble_ = NULL;
 }
 
 }  // namespace chromeos