| Index: chrome/browser/ui/views/status_bubble_views.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/status_bubble_views.cc (revision 71854)
|
| +++ chrome/browser/ui/views/status_bubble_views.cc (working copy)
|
| @@ -7,7 +7,6 @@
|
| #include <algorithm>
|
|
|
| #include "app/resource_bundle.h"
|
| -#include "app/text_elider.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/message_loop.h"
|
| #include "base/string_util.h"
|
| @@ -24,6 +23,7 @@
|
| #include "third_party/skia/include/core/SkRect.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| #include "ui/base/animation/linear_animation.h"
|
| +#include "ui/base/text/text_elider.h"
|
| #include "views/controls/label.h"
|
| #include "views/controls/scrollbar/native_scroll_bar.h"
|
| #include "views/screen.h"
|
| @@ -648,7 +648,7 @@
|
| popup_->GetBounds(&popup_bounds, true);
|
| int text_width = static_cast<int>(popup_bounds.width() -
|
| (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1);
|
| - url_text_ = gfx::ElideUrl(url, view_->Label::font(),
|
| + url_text_ = ui::ElideUrl(url, view_->Label::font(),
|
| text_width, UTF16ToWideHack(languages));
|
|
|
| std::wstring original_url_text =
|
| @@ -803,7 +803,7 @@
|
| gfx::Rect popup_bounds;
|
| popup_->GetBounds(&popup_bounds, true);
|
| int max_status_bubble_width = GetMaxStatusBubbleWidth();
|
| - url_text_ = gfx::ElideUrl(url_, view_->Label::font(),
|
| + url_text_ = ui::ElideUrl(url_, view_->Label::font(),
|
| max_status_bubble_width, UTF16ToWideHack(languages_));
|
| int expanded_bubble_width =std::max(GetStandardStatusBubbleWidth(),
|
| std::min(view_->Label::font().GetStringWidth(url_text_) +
|
|
|