| Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc (revision 95169)
|
| +++ chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc (working copy)
|
| @@ -176,6 +176,18 @@
|
| Layout();
|
| }
|
|
|
| +
|
| +gfx::Size AutocompleteResultView::GetCollapsedSize() {
|
| + return gfx::Size(icon_bounds_.right() + LocationBarView::kItemPadding +
|
| + ellipsis_width_ + LocationBarView::kItemPadding, height());
|
| +}
|
| +
|
| +gfx::Size AutocompleteResultView::GetPreferredSize() {
|
| + return gfx::Size(0, std::max(
|
| + default_icon_size_ + (kMinimumIconVerticalPadding * 2),
|
| + GetTextHeight() + (kMinimumTextVerticalPadding * 2)));
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // AutocompleteResultView, protected:
|
|
|
| @@ -493,12 +505,6 @@
|
| runs->clear();
|
| }
|
|
|
| -gfx::Size AutocompleteResultView::GetPreferredSize() {
|
| - return gfx::Size(0, std::max(
|
| - default_icon_size_ + (kMinimumIconVerticalPadding * 2),
|
| - GetTextHeight() + (kMinimumTextVerticalPadding * 2)));
|
| -}
|
| -
|
| void AutocompleteResultView::Layout() {
|
| const SkBitmap* icon = GetIcon();
|
| icon_bounds_.SetRect(LocationBarView::kEdgeItemPadding +
|
| @@ -528,3 +534,4 @@
|
| mirroring_context_->Initialize(x, text_bounds_.width());
|
| PaintMatch(canvas, match_, x);
|
| }
|
| +
|
|
|