Index: chrome/browser/ui/views/location_bar/location_bar_view.cc |
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
index 72a84ce3a9d8985274c0a5ce3c84e979787e033a..402a53aced13798859209218146c56bd03494273 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
@@ -227,6 +227,15 @@ LocationBarView::~LocationBarView() { |
browser_->search_model()->RemoveObserver(this); |
} |
+// static |
+void LocationBarView::InitTouchableLocationBarView(views::View* view) { |
+ int horizontal_padding = GetBuiltInHorizontalPaddingForChildViews(); |
+ if (horizontal_padding != 0) { |
+ view->set_border(views::Border::CreateEmptyBorder( |
+ 3, horizontal_padding, 3, horizontal_padding)); |
+ } |
+} |
+ |
void LocationBarView::Init() { |
// We need to be in a Widget, otherwise GetNativeTheme() may change and we're |
// not prepared for that. |
@@ -716,25 +725,25 @@ void LocationBarView::Layout() { |
} else { |
leading_decorations.AddDecoration( |
vertical_edge_thickness(), location_height, |
- location_icon_view_->GetBuiltInHorizontalPadding(), |
+ GetBuiltInHorizontalPaddingForChildViews(), |
location_icon_view_); |
} |
if (star_view_ && star_view_->visible()) { |
trailing_decorations.AddDecoration( |
vertical_edge_thickness(), location_height, |
- star_view_->GetBuiltInHorizontalPadding(), star_view_); |
+ GetBuiltInHorizontalPaddingForChildViews(), star_view_); |
} |
if (script_bubble_icon_view_ && script_bubble_icon_view_->visible()) { |
trailing_decorations.AddDecoration( |
vertical_edge_thickness(), location_height, |
- script_bubble_icon_view_->GetBuiltInHorizontalPadding(), |
+ GetBuiltInHorizontalPaddingForChildViews(), |
script_bubble_icon_view_); |
} |
if (open_pdf_in_reader_view_ && open_pdf_in_reader_view_->visible()) { |
trailing_decorations.AddDecoration( |
vertical_edge_thickness(), location_height, |
- open_pdf_in_reader_view_->GetBuiltInHorizontalPadding(), |
+ GetBuiltInHorizontalPaddingForChildViews(), |
open_pdf_in_reader_view_); |
} |
for (PageActionViews::const_iterator i(page_action_views_.begin()); |
@@ -742,7 +751,7 @@ void LocationBarView::Layout() { |
if ((*i)->visible()) { |
trailing_decorations.AddDecoration( |
vertical_edge_thickness(), location_height, |
- (*i)->GetBuiltInHorizontalPadding(), (*i)); |
+ GetBuiltInHorizontalPaddingForChildViews(), (*i)); |
} |
} |
if (zoom_view_->visible()) { |
@@ -755,7 +764,7 @@ void LocationBarView::Layout() { |
if ((*i)->visible()) { |
trailing_decorations.AddDecoration( |
bubble_location_y, bubble_height, false, 0, item_padding, |
- item_padding, (*i)->GetBuiltInHorizontalPadding(), (*i)); |
+ item_padding, GetBuiltInHorizontalPaddingForChildViews(), (*i)); |
} |
} |
if (autofill_credit_card_view_->visible()) { |
@@ -1082,6 +1091,11 @@ gfx::Rect LocationBarView::GetOmniboxBounds() const { |
return bounds(); |
} |
+// static |
+int LocationBarView::GetBuiltInHorizontalPaddingForChildViews() { |
+ return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ? GetItemPadding() / 2 : 0; |
Peter Kasting
2013/08/06 20:32:42
Nit: Parens around binary subexpr
tfarina
2013/08/07 18:42:53
Done.
tfarina
2013/08/07 18:42:53
Done.
|
+} |
+ |
int LocationBarView::GetHorizontalEdgeThickness() const { |
// In maximized popup mode, there isn't any edge. |
return (is_popup_mode_ && browser_ && browser_->window() && |
@@ -1237,8 +1251,8 @@ void LocationBarView::PaintPageActionBackgrounds(gfx::Canvas* canvas) { |
page_action_view != page_action_views_.end(); |
++page_action_view) { |
gfx::Rect bounds = (*page_action_view)->bounds(); |
- int horizontal_padding = GetItemPadding() - |
- (*page_action_view)->GetBuiltInHorizontalPadding(); |
+ int horizontal_padding = |
+ GetItemPadding() - GetBuiltInHorizontalPaddingForChildViews(); |
// Make the bounding rectangle include the whole vertical range of the |
// location bar, and the mid-point pixels between adjacent page actions. |
// |