Remove prefix eliding

chrome/browser/ui/views/tabs/base_tab.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/views/tabs/base_tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #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"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_container.h"
@@ skipping 444 matching lines @@
       }
     }
     canvas->Restore();
   }
 }
 
 void BaseTab::PaintTitle(gfx::Canvas* canvas, SkColor title_color) {
   // Paint the Title.
   const gfx::Rect& title_bounds = GetTitleBounds();
   string16 title = data().title;
-  bool should_truncate = false;
-  int prefix_length = 0;
 
   if (title.empty()) {
     title = data().loading ?
         l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE) :
         TabContentsWrapper::GetDefaultTitle();
   } else {
     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 6 average chars.
-    should_truncate =
-        data().common_prefix_length > TitlePrefixMatcher::kMinElidingLength &&
-        font_->GetExpectedTextWidth(6) < title_bounds.width() &&
-        font_->GetStringWidth(title) > title_bounds.width();
-    prefix_length = data().common_prefix_length -
-                    TitlePrefixMatcher::kCommonCharsToShow;
   }
 
 #if defined(OS_WIN)
   canvas->AsCanvasSkia()->DrawFadeTruncatingString(title,

[Peter Kasting, 2011/05/23 23:06:43]

Nit: I think we should also simplify this API.  Let's remove the Head and
HeadAndTail functionality entirely.

[sail, 2011/05/23 23:25:36]

Sounds good. I'll send that out separately. I'm trying to get a minimal change
that Jason can approve for M12.

-      should_truncate ? gfx::CanvasSkia::TruncateFadeHeadAndTail :
-                        gfx::CanvasSkia::TruncateFadeTail,
-      prefix_length, *font_, title_color, title_bounds);
+      gfx::CanvasSkia::TruncateFadeTail, 0, *font_, title_color, title_bounds);
 #else
-  if (should_truncate)
-    title.replace(0, prefix_length, UTF8ToUTF16(ui::kEllipsis));
   canvas->DrawStringInt(title, *font_, title_color,
                         title_bounds.x(), title_bounds.y(),
                         title_bounds.width(), title_bounds.height());
 #endif
 }
 
 void BaseTab::AnimationProgressed(const ui::Animation* animation) {
   SchedulePaint();
 }
 
@@ skipping 75 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }