OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h" | 5 #include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h" |
6 | 6 |
7 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 7 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
8 #include "third_party/skia/include/core/SkPaint.h" | 8 #include "third_party/skia/include/core/SkPaint.h" |
9 #include "ui/gfx/canvas.h" | 9 #include "ui/gfx/canvas.h" |
10 #include "ui/gfx/font.h" | 10 #include "ui/gfx/font.h" |
11 #include "ui/gfx/path.h" | 11 #include "ui/gfx/path.h" |
12 #include "ui/gfx/rect.h" | 12 #include "ui/gfx/rect.h" |
13 #include "ui/gfx/size.h" | 13 #include "ui/gfx/size.h" |
14 #include "ui/views/view.h" | 14 #include "ui/views/view.h" |
15 | 15 |
16 // TouchOmniboxResultView ------------------------------------------------ | 16 // TouchOmniboxResultView ------------------------------------------------ |
17 | 17 |
18 TouchOmniboxResultView::TouchOmniboxResultView(OmniboxResultViewModel* model, | 18 TouchOmniboxResultView::TouchOmniboxResultView( |
19 int model_index, | 19 OmniboxResultViewModel* model, |
20 views::View* location_bar, | 20 int model_index, |
21 const gfx::Font& font) | 21 OmniboxViewDelegate* view_delegate, |
22 : OmniboxResultView(model, model_index, location_bar, font) { | 22 const gfx::Font& font) |
| 23 : OmniboxResultView(model, model_index, view_delegate, font) { |
23 set_edge_item_padding(8); | 24 set_edge_item_padding(8); |
24 set_item_padding(8); | 25 set_item_padding(8); |
25 set_minimum_text_vertical_padding(10); | 26 set_minimum_text_vertical_padding(10); |
26 } | 27 } |
27 | 28 |
28 TouchOmniboxResultView::~TouchOmniboxResultView() { | 29 TouchOmniboxResultView::~TouchOmniboxResultView() { |
29 } | 30 } |
30 | 31 |
31 void TouchOmniboxResultView::PaintMatch(gfx::Canvas* canvas, | 32 void TouchOmniboxResultView::PaintMatch(gfx::Canvas* canvas, |
32 const AutocompleteMatch& match, | 33 const AutocompleteMatch& match, |
(...skipping 17 matching lines...) Expand all Loading... |
50 int TouchOmniboxResultView::GetTextHeight() const { | 51 int TouchOmniboxResultView::GetTextHeight() const { |
51 return OmniboxResultView::GetTextHeight() * 2; | 52 return OmniboxResultView::GetTextHeight() * 2; |
52 } | 53 } |
53 | 54 |
54 // TouchOmniboxPopupContentsView ----------------------------------------- | 55 // TouchOmniboxPopupContentsView ----------------------------------------- |
55 | 56 |
56 TouchOmniboxPopupContentsView::TouchOmniboxPopupContentsView( | 57 TouchOmniboxPopupContentsView::TouchOmniboxPopupContentsView( |
57 const gfx::Font& font, | 58 const gfx::Font& font, |
58 OmniboxView* omnibox_view, | 59 OmniboxView* omnibox_view, |
59 OmniboxEditModel* edit_model, | 60 OmniboxEditModel* edit_model, |
60 views::View* location_bar) | 61 OmniboxViewDelegate* view_delegate) |
61 : OmniboxPopupContentsView(font, omnibox_view, edit_model, location_bar) { | 62 : OmniboxPopupContentsView(font, omnibox_view, edit_model, view_delegate) { |
62 } | 63 } |
63 | 64 |
64 TouchOmniboxPopupContentsView::~TouchOmniboxPopupContentsView() { | 65 TouchOmniboxPopupContentsView::~TouchOmniboxPopupContentsView() { |
65 } | 66 } |
66 | 67 |
67 void TouchOmniboxPopupContentsView::UpdatePopupAppearance() { | 68 void TouchOmniboxPopupContentsView::UpdatePopupAppearance() { |
68 OmniboxPopupContentsView::UpdatePopupAppearance(); | 69 OmniboxPopupContentsView::UpdatePopupAppearance(); |
69 Layout(); | 70 Layout(); |
70 } | 71 } |
71 | 72 |
(...skipping 21 matching lines...) Expand all Loading... |
93 int line_y = child->y() + child->height() - 1; | 94 int line_y = child->y() + child->height() - 1; |
94 canvas->DrawLine(gfx::Point(bounds.x(), line_y), | 95 canvas->DrawLine(gfx::Point(bounds.x(), line_y), |
95 gfx::Point(bounds.right(), line_y), divider_color); | 96 gfx::Point(bounds.right(), line_y), divider_color); |
96 } | 97 } |
97 } | 98 } |
98 | 99 |
99 OmniboxResultView* TouchOmniboxPopupContentsView::CreateResultView( | 100 OmniboxResultView* TouchOmniboxPopupContentsView::CreateResultView( |
100 OmniboxResultViewModel* model, | 101 OmniboxResultViewModel* model, |
101 int model_index, | 102 int model_index, |
102 const gfx::Font& font) { | 103 const gfx::Font& font) { |
103 return new TouchOmniboxResultView(model, model_index, location_bar(), font); | 104 return new TouchOmniboxResultView(model, model_index, view_delegate(), font); |
104 } | 105 } |
105 | 106 |
106 std::vector<views::View*> TouchOmniboxPopupContentsView::GetVisibleChildren() { | 107 std::vector<views::View*> TouchOmniboxPopupContentsView::GetVisibleChildren() { |
107 std::vector<View*> visible_children; | 108 std::vector<View*> visible_children; |
108 for (int i = 0; i < child_count(); ++i) { | 109 for (int i = 0; i < child_count(); ++i) { |
109 View* v = child_at(i); | 110 View* v = child_at(i); |
110 if (child_at(i)->visible()) | 111 if (child_at(i)->visible()) |
111 visible_children.push_back(v); | 112 visible_children.push_back(v); |
112 } | 113 } |
113 return visible_children; | 114 return visible_children; |
114 } | 115 } |
OLD | NEW |