Elide the EV bubble when it's extremely long. This limits it to half the location bar width, unless eliding to that would result in a width of less than 150 px.

BUG=42856
TEST=Visit https://www.barbican.org.uk/eticketing/index.asp and make the window smaller.  The EV bubble should shrink, eliding in middle, until it hits a minimum size.
Review URL: http://codereview.chromium.org/2084012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47819 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index fd2b20e..c0e4f93 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -145,7 +145,7 @@ NSMutableAttributedString* AutocompletePopupViewMac::ElideString(
   }
 
   // If ElideText() decides to do nothing, nothing to be done.
-  const std::wstring elided(ElideText(originalString, font, width));
+  const std::wstring elided(ElideText(originalString, font, width, false));
   if (0 == elided.compare(originalString)) {
     return aString;
   }
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm
index aff63db..56856dd 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -441,14 +441,14 @@ TEST_F(AutocompletePopupViewMacTest, ElideString) {
 
   // When elided, result is the same as ElideText().
   ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, kNarrow);
-  std::wstring elided(ElideText(wideContents, font_, kNarrow));
+  std::wstring elided(ElideText(wideContents, font_, kNarrow, false));
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
   EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]);
 
   // When elided, result is the same as ElideText().
   ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, 0.0);
-  elided = ElideText(wideContents, font_, 0.0);
+  elided = ElideText(wideContents, font_, 0.0, false);
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
   EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]);