Cleanup for views::Label:

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 45 matching lines @@
   explicit Label(const string16& text);
   Label(const string16& text, const gfx::Font& font);
   virtual ~Label();
 
   // Set the font.
   virtual void SetFont(const gfx::Font& font);
 
   // Set the label text.
   void SetText(const string16& text);
 
+  // Set URL Value - text_ is set to spec().
+  void SetURL(const GURL& url);
+
   // Return the font used by this label.
   gfx::Font font() const { return font_; }
 
   // Return the label text.
-  const string16 GetText() const;
-
-  // Set URL Value - text_ is set to spec().
-  void SetURL(const GURL& url);
-
-  // Return the label URL.
-  const GURL GetURL() const;
+  string16 text() const { return text_; };
 
   // Enables or disables auto-color-readability (enabled by default).  If this
   // is enabled, then calls to set any foreground or background color will
   // trigger an automatic mapper that uses color_utils::GetReadableColor() to
   // ensure that the foreground colors are readable over the background color.
   void SetAutoColorReadabilityEnabled(bool enabled);
 
   // Set the color.  This will automatically force the color to be readable
   // over the current background color.
   virtual void SetEnabledColor(const SkColor& color);
@@ skipping 169 matching lines @@
   SkColor actual_enabled_color_;
   SkColor requested_disabled_color_;
   SkColor actual_disabled_color_;
   SkColor background_color_;
   bool auto_color_readability_;
   mutable gfx::Size text_size_;
   mutable bool text_size_valid_;
   bool is_multi_line_;
   bool allow_character_break_;
   bool elide_in_middle_;
-  bool url_set_;
   Alignment horiz_alignment_;
   string16 tooltip_text_;
   // Whether the mouse is over this label.
   bool contains_mouse_;
   scoped_ptr<Background> mouse_over_background_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // The following member variable is used to control whether the
   // directionality is auto-detected based on first strong directionality
   // character or is determined by chrome UI's locale.
   DirectionalityMode directionality_mode_;
   // When embedded in a larger control that is focusable, setting this flag
   // allows this view to be painted as focused even when it is itself not.
   bool paint_as_focused_;
   // When embedded in a larger control that is focusable, setting this flag
   // allows this view to reserve space for a focus border that it otherwise
   // might not have because it is not itself focusable.
   bool has_focus_border_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_