Cleanup for views::Label:

ui/views/controls/label.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 "ui/views/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 36 matching lines @@
 
 void Label::SetFont(const gfx::Font& font) {
   font_ = font;
   text_size_valid_ = false;
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 void Label::SetText(const string16& text) {
   text_ = text;
-  url_set_ = false;
+  url_ = GURL();
   text_size_valid_ = false;
   PreferredSizeChanged();
   SchedulePaint();
 }
 
-const string16 Label::GetText() const {
-  return url_set_ ? UTF8ToUTF16(url_.spec()) : text_;
-}
-
 void Label::SetURL(const GURL& url) {
+  DCHECK(url.is_valid());
   url_ = url;
   text_ = UTF8ToUTF16(url_.spec());
-  url_set_ = true;
   text_size_valid_ = false;
   PreferredSizeChanged();
   SchedulePaint();
 }
 
-const GURL Label::GetURL() const {
-  return url_set_ ? url_ : GURL(UTF16ToUTF8(text_));
-}
-
 void Label::SetAutoColorReadabilityEnabled(bool enabled) {
   auto_color_readability_ = enabled;
   RecalculateColors();
 }
 
 void Label::SetEnabledColor(const SkColor& color) {
   requested_enabled_color_ = color;
   RecalculateColors();
 }
 
@@ skipping 257 matching lines @@
     kDefaultDisabledColor = SK_ColorGRAY;
     kDefaultBackgroundColor = SK_ColorWHITE;
 #endif
 
     initialized = true;
   }
 
   contains_mouse_ = false;
   font_ = font;
   text_size_valid_ = false;
-  url_set_ = false;
   requested_enabled_color_ = kDefaultEnabledColor;
   requested_disabled_color_ = kDefaultDisabledColor;
   background_color_ = kDefaultBackgroundColor;
   auto_color_readability_ = true;
   RecalculateColors();
   horiz_alignment_ = ALIGN_CENTER;
   is_multi_line_ = false;
   allow_character_break_ = false;
   elide_in_middle_ = false;
   collapse_when_hidden_ = false;
@@ skipping 59 matching lines @@
 
 int Label::ComputeDrawStringFlags() const {
   int flags = 0;
 
   // We can't use subpixel rendering if the background is non-opaque.
   if (SkColorGetA(background_color_) != 0xFF)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
 
   if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
     base::i18n::TextDirection direction =
-        base::i18n::GetFirstStrongCharacterDirection(GetText());
+        base::i18n::GetFirstStrongCharacterDirection(text_);
     if (direction == base::i18n::RIGHT_TO_LEFT)
       flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
     else
       flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
   }
 
   if (!is_multi_line_)
     return flags;
 
   flags |= gfx::Canvas::MULTI_LINE;
@@ skipping 27 matching lines @@
   gfx::Insets insets(GetInsets());
   bounds.Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
   return bounds;
 }
 
 void Label::CalculateDrawStringParams(string16* paint_text,
                                       gfx::Rect* text_bounds,
                                       int* flags) const {
   DCHECK(paint_text && text_bounds && flags);
 
-  if (url_set_) {
+  if (!url_.is_empty()) {
     // TODO(jungshik) : Figure out how to get 'intl.accept_languages'
     // preference and use it when calling ElideUrl.
     *paint_text =
         ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::string());
 
     // An URLs is always treated as an LTR text and therefore we should
     // explicitly mark it as such if the locale is RTL so that URLs containing
     // Hebrew or Arabic characters are displayed correctly.
     //
     // Note that we don't check the View's UI layout setting in order to
     // determine whether or not to insert the special Unicode formatting
     // characters. We use the locale settings because an URL is always treated
     // as an LTR string, even if its containing view does not use an RTL UI
     // layout.
     *paint_text = base::i18n::GetDisplayStringInLTRDirectionality(
         *paint_text);
   } else if (elide_in_middle_) {
     *paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
                                 ui::ELIDE_IN_MIDDLE);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeDrawStringFlags();
 }
 
 }  // namespace views