Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: ui/views/controls/label.cc

Issue 10829047: Deprecate unused views::Label::SetURL(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/label.h ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index f907f9f51ae1959ce9f051b9c277938bc8d9f45a..9412a6ab792a2827454cdbd828ea5ca720eb9828 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -55,7 +55,6 @@ void Label::SetFont(const gfx::Font& font) {
void Label::SetText(const string16& text) {
text_ = text;
- url_ = GURL();
text_size_valid_ = false;
is_email_ = false;
PreferredSizeChanged();
@@ -67,16 +66,6 @@ void Label::SetEmail(const string16& email) {
is_email_ = true;
}
-void Label::SetURL(const GURL& url) {
- DCHECK(url.is_valid());
- url_ = url;
- text_ = UTF8ToUTF16(url_.spec());
- text_size_valid_ = false;
- is_email_ = false;
- PreferredSizeChanged();
- SchedulePaint();
-}
-
void Label::SetAutoColorReadabilityEnabled(bool enabled) {
auto_color_readability_ = enabled;
RecalculateColors();
@@ -494,24 +483,7 @@ void Label::CalculateDrawStringParams(string16* paint_text,
int* flags) const {
DCHECK(paint_text && text_bounds && flags);
- 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 (is_email_) {
+ if (is_email_) {
*paint_text = ui::ElideEmail(text_, font_, GetAvailableRect().width());
} else if (elide_in_middle_) {
*paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
« no previous file with comments | « ui/views/controls/label.h ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698