Improvements to tab title prefix eliding as per email discussions.

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 1086 matching lines @@
   scoped_nsobject<TabContentsController> contentsController(
       [[TabContentsController alloc] initWithContents:contents->tab_contents()
                                              delegate:self]);
   [tabContentsArray_ insertObject:contentsController atIndex:index];
 
   // Make a new tab and add it to the strip. Keep track of its controller.
   TabController* newController = [self newTab];
   [newController setMini:tabStripModel_->IsMiniTab(modelIndex)];
   [newController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
   [newController setApp:tabStripModel_->IsAppTab(modelIndex)];
+  [newController setUrl:contents->tab_contents()->GetURL()];
   [tabArray_ insertObject:newController atIndex:index];
   NSView* newView = [newController view];
 
   // Set the originating frame to just below the strip so that it animates
   // upwards as it's being initially layed out. Oddly, this works while doing
   // something similar in |-layoutTabs| confuses the window server.
   [newView setFrame:NSOffsetRect([newView frame],
                                  0, -[[self class] defaultTabHeight])];
 
   [self setTabTitle:newController withContents:contents->tab_contents()];
@@ skipping 377 matching lines @@
   TabController* tabController = [tabArray_ objectAtIndex:index];
   DCHECK([tabController isKindOfClass:[TabController class]]);
 
   // Don't do anything if the change was already picked up by the move event.
   if (tabStripModel_->IsMiniTab(modelIndex) == [tabController mini])
     return;
 
   [tabController setMini:tabStripModel_->IsMiniTab(modelIndex)];
   [tabController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
   [tabController setApp:tabStripModel_->IsAppTab(modelIndex)];
+  [tabController setUrl:contents->tab_contents()->GetURL()];
   [self updateFaviconForContents:contents->tab_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)setFrameOfSelectedTab:(NSRect)frame {
@@ skipping 522 matching lines @@
   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], tabIndex));
+          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]);
@@ skipping 30 matching lines @@
   }
 
   NSString* menuTitle =
       l10n_util::GetNSStringWithFixup(IDS_PROFILES_CREATE_NEW_PROFILE_OPTION);
   [menu addItemWithTitle:menuTitle
                   action:NULL
            keyEquivalent:@""];
 }
 
 @end