summaryrefslogtreecommitdiffstats
path: root/ui/base/text
diff options
context:
space:
mode:
authorericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 17:38:06 +0000
committerericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 17:38:06 +0000
commit98901d9f7dc19e58a926970a26e31832d1377fa5 (patch)
tree83c516f48264356a6bd9df239b62ab3f412efa22 /ui/base/text
parentf0b9405a4617ecdffc9a4d8d616cf9bafc84ae9f (diff)
downloadchromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.zip
chromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.tar.gz
chromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.tar.bz2
Revert 128753 - Add full support for filesystem URLs.
BUG=114484 TEST=existing filesystem tests don't break Review URL: https://chromiumcodereview.appspot.com/7811006 TBR=ericu@google.com Review URL: https://chromiumcodereview.appspot.com/9808101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/text')
-rw-r--r--ui/base/text/text_elider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index bfd7f90..62ad7d0 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -225,8 +225,8 @@ string16 ElideUrl(const GURL& url,
if (available_pixel_width <= 0)
return url_string;
- // If non-standard, return plain eliding.
- if (!url.IsStandard())
+ // If non-standard or not file type, return plain eliding.
+ if (!(url.SchemeIsFile() || url.IsStandard()))
return ElideText(url_string, font, available_pixel_width, ELIDE_AT_END);
// Now start eliding url_string to fit within available pixel width.