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

Unified Diff: chrome/browser/ui/views/tabs/base_tab.cc

Issue 6783015: Improvements to tab title prefix eliding as per email discussions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « chrome/browser/ui/title_prefix_matcher_unittest.cc ('k') | chrome/browser/ui/views/tabs/base_tab_strip.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/base_tab.cc
===================================================================
--- chrome/browser/ui/views/tabs/base_tab.cc (revision 80442)
+++ chrome/browser/ui/views/tabs/base_tab.cc (working copy)
@@ -10,6 +10,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/title_prefix_matcher.h"
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/tabs/tab_controller.h"
#include "chrome/common/chrome_switches.h"
@@ -479,11 +480,14 @@
Browser::FormatTitleForDisplay(&title);
// If we'll need to truncate, check if we should also truncate
// a common prefix, but only if there is enough room for it.
- // We arbitrarily choose to request enough room for 10 average chars.
- if (data().common_prefix_length > 0 &&
- font_->GetExpectedTextWidth(10) < title_bounds.width() &&
+ // We arbitrarily choose to request enough room for 6 average chars.
+ if (data().common_prefix_length > TitlePrefixMatcher::kMinElidingLength &&
+ font_->GetExpectedTextWidth(6) < title_bounds.width() &&
font_->GetStringWidth(title) > title_bounds.width()) {
- title.replace(0, data().common_prefix_length, UTF8ToUTF16(ui::kEllipsis));
+ title.replace(0,
+ data().common_prefix_length -
+ TitlePrefixMatcher::kCommonCharsToShow,
+ UTF8ToUTF16(ui::kEllipsis));
}
}
canvas->DrawStringInt(title, *font_, title_color,
« no previous file with comments | « chrome/browser/ui/title_prefix_matcher_unittest.cc ('k') | chrome/browser/ui/views/tabs/base_tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698