Remove prefix eliding

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <limits>
 #include <string>
@@ skipping 29 matching lines @@
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #import "chrome/browser/ui/cocoa/tracking_area.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
-#include "chrome/browser/ui/title_prefix_matcher.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 104 matching lines @@
 - (NSInteger)indexFromModelIndex:(NSInteger)index;
 - (NSInteger)numberOfOpenTabs;
 - (NSInteger)numberOfOpenMiniTabs;
 - (NSInteger)numberOfOpenNonMiniTabs;
 - (void)mouseMoved:(NSEvent*)event;
 - (void)setTabTrackingAreasEnabled:(BOOL)enabled;
 - (void)droppingURLsAt:(NSPoint)point
             givesIndex:(NSInteger*)index
            disposition:(WindowOpenDisposition*)disposition;
 - (void)setNewTabButtonHoverState:(BOOL)showHover;
-- (void)updateCommonTitlePrefix;
 - (BOOL)shouldShowProfileMenuButton;
 - (void)updateProfileMenuButton;
 @end
 
 // A simple view class that prevents the Window Server from dragging the area
 // behind tabs. Sometimes core animation confuses it. Unfortunately, it can also
 // falsely pick up clicks during rapid tab closure, so we have to account for
 // that.
 @interface TabStripControllerDragBlockingView : NSView {
   TabStripController* controller_;  // weak; owns us
@@ skipping 1001 matching lines @@
     [self layoutTabs];
   }
 
   // During normal loading, we won't yet have a favicon and we'll get
   // subsequent state change notifications to show the throbber, but when we're
   // dragging a tab out into a new window, we have to put the tab's favicon
   // into the right state up front as we won't be told to do it from anywhere
   // else.
   [self updateFaviconForContents:contents atIndex:modelIndex];
 
-  [self updateCommonTitlePrefix];
-
   // Send a broadcast that the number of tabs have changed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabStripNumberOfTabsChanged
                     object:self];
 }
 
 // Called when a notification is received from the model to select a particular
 // tab. Swaps in the toolbar and content area associated with |newContents|.
 - (void)activateTabWithContents:(TabContentsWrapper*)newContents
                previousContents:(TabContentsWrapper*)oldContents
@@ skipping 111 matching lines @@
   [controller setTarget:nil];
 
   if ([hoveredTab_ isEqual:tab])
     hoveredTab_ = nil;
 
   NSValue* identifier = [NSValue valueWithPointer:tab];
   [targetFrames_ removeObjectForKey:identifier];
 
   // Once we're totally done with the tab, delete its controller
   [tabArray_ removeObjectAtIndex:index];
-
-  [self updateCommonTitlePrefix];
 }
 
 // Called by the CAAnimation delegate when the tab completes the closing
 // animation.
 - (void)animationDidStopForController:(TabController*)controller
                              finished:(BOOL)finished {
   [closingControllers_ removeObject:controller];
   [self removeTab:controller];
 }
 
@@ skipping 181 matching lines @@
   TabController* tabController = [tabArray_ objectAtIndex:index];
 
   if (change != TabStripModelObserver::LOADING_ONLY)
     [self setTabTitle:tabController withContents:contents->tab_contents()];
 
   [self updateFaviconForContents:contents atIndex:modelIndex];
 
   TabContentsController* updatedController =
       [tabContentsArray_ objectAtIndex:index];
   [updatedController tabDidChange:contents->tab_contents()];
-
-  [self updateCommonTitlePrefix];
 }
 
 // Called when a tab is moved (usually by drag&drop). Keep our parallel arrays
 // in sync with the tab strip model. It can also be pinned/unpinned
 // simultaneously, so we need to take care of that.
 - (void)tabMovedWithContents:(TabContentsWrapper*)contents
                    fromIndex:(NSInteger)modelFrom
                      toIndex:(NSInteger)modelTo {
   // Take closing tabs into account.
   NSInteger from = [self indexFromModelIndex:modelFrom];
@@ skipping 35 matching lines @@
 
   [tabController setMini:tabStripModel_->IsMiniTab(modelIndex)];
   [tabController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
   [tabController setApp:tabStripModel_->IsAppTab(modelIndex)];
   [tabController setUrl:contents->tab_contents()->GetURL()];
   [self updateFaviconForContents:contents atIndex:modelIndex];
   // If the tab is being restored and it's pinned, the mini state is set after
   // the tab has already been rendered, so re-layout the tabstrip. In all other
   // cases, the state is set before the tab is rendered so this isn't needed.
   [self layoutTabs];
-
-  [self updateCommonTitlePrefix];
 }
 
 - (void)setFrameOfActiveTab:(NSRect)frame {
   NSView* view = [self activeTabView];
   NSValue* identifier = [NSValue valueWithPointer:view];
   [targetFrames_ setObject:[NSValue valueWithRect:frame]
                     forKey:identifier];
   [view setFrame:frame];
 }
 
@@ skipping 513 matching lines @@
   NSInteger modelIndex = [self modelIndexForContentsView:tabContentsView];
   NSInteger index = [self indexFromModelIndex:modelIndex];
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:YES];
   }
 }
 
-// Update the lengths of common title prefixes for all tabs. This needs
-// to be done every time tabs are added/removed or when titles change.
-- (void)updateCommonTitlePrefix {
-  DCHECK_EQ([tabArray_ count], [tabArray_ count]);
-
-  std::vector<TitlePrefixMatcher::TitleInfo> tabTitleInfos;
-  ScopedVector<string16> titles;
-  size_t tabIndex;
-  size_t tabCount = [tabArray_ count];
-
-  // Add all tab titles to |tabTitleInfos|.
-  for (tabIndex = 0; tabIndex < tabCount; ++tabIndex) {
-    TabController* tabController = [tabArray_ objectAtIndex:tabIndex];
-    string16 title = base::SysNSStringToUTF16([tabController title]);
-    if (!title.empty() && ![tabController mini]) {
-      titles.push_back(new string16(title));
-      tabTitleInfos.push_back(TitlePrefixMatcher::TitleInfo(
-          titles[titles.size() - 1], [tabController url], tabIndex));
-    }
-  }
-
-  // Calculate the prefix length.
-  TitlePrefixMatcher::CalculatePrefixLengths(&tabTitleInfos);
-
-  // Update the prefix length for each tab.
-  for (size_t infoIndex = 0; infoIndex < tabTitleInfos.size(); ++infoIndex) {
-    tabIndex = tabTitleInfos[infoIndex].caller_value;
-    DCHECK(tabIndex < [tabArray_ count]);
-    TabController* tabController = [tabArray_ objectAtIndex:tabIndex];
-    [tabController setTitleCommonPrefixLength:
-        tabTitleInfos[infoIndex].prefix_length];
-  }
-}
-
 - (BOOL)shouldShowProfileMenuButton {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))
     return NO;
   if (browser_->profile()->IsOffTheRecord())
     return NO;
   return (!browser_->profile()->GetPrefs()->GetString(
         prefs::kGoogleServicesUsername).empty());
 }
 
 - (void)updateProfileMenuButton {
   if (![self shouldShowProfileMenuButton]) {
     [profileMenuButton_ setHidden:YES];
     return;
   }
 
   std::string profileName = browser_->profile()->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   [profileMenuButton_ setProfileDisplayName:
       [NSString stringWithUTF8String:profileName.c_str()]];
   [profileMenuButton_ setHidden:NO];
 }
 
 @end