Cleanup for views::Label:

chrome/browser/ui/views/location_bar/selected_keyword_view.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/ui/views/location_bar/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 28 matching lines @@
   return size;
 }
 
 gfx::Size SelectedKeywordView::GetMinimumSize() {
   gfx::Size size(GetNonLabelSize());
   size.Enlarge(partial_label_.GetMinimumSize().width(), 0);
   return size;
 }
 
 void SelectedKeywordView::Layout() {
-  SetLabel((width() == GetPreferredSize().width()) ?
-      full_label_.GetText() : partial_label_.GetText());
+  SetLabel(((width() == GetPreferredSize().width()) ?
+      full_label_ : partial_label_).text());
   IconLabelBubbleView::Layout();
 }
 
 void SelectedKeywordView::SetKeyword(const string16& keyword) {
   keyword_ = keyword;
   if (keyword.empty())
     return;
   DCHECK(profile_);
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (!model)
     return;
 
   bool is_extension_keyword;
   const string16 short_name = model->GetKeywordShortName(keyword,
                                                          &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   full_label_.SetText(
       l10n_util::GetStringFUTF16(message_id, short_name));
   const std::wstring min_string(
       location_bar_util::CalculateMinString(UTF16ToWide(short_name)));
   partial_label_.SetText(min_string.empty() ?
-      full_label_.GetText() :
+      full_label_.text() :
       l10n_util::GetStringFUTF16(message_id, WideToUTF16(min_string)));
 }