summaryrefslogtreecommitdiffstats
path: root/ui/base/text
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 02:19:18 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 02:19:18 +0000
commita8217e2c510a15dc5664ad1b1168a8e0df4493aa (patch)
tree014fc1818464d4fb8433f1cf0c03c3c6fc17347c /ui/base/text
parent3ac565d1b634e70715be51a51a7e9999084556f9 (diff)
downloadchromium_src-a8217e2c510a15dc5664ad1b1168a8e0df4493aa.zip
chromium_src-a8217e2c510a15dc5664ad1b1168a8e0df4493aa.tar.gz
chromium_src-a8217e2c510a15dc5664ad1b1168a8e0df4493aa.tar.bz2
Revert 130248 - Add full support for filesystem URLs.
BUG=114484 TEST=existing filesystem tests don't break Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128753 Review URL: https://chromiumcodereview.appspot.com/7811006 TBR=ericu@google.com Review URL: https://chromiumcodereview.appspot.com/9950079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130293 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.