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 14b85c68aa2b2a58e504e323005eb679a151996e..e006e3a297d78533c18c3aef944fe61c63722b48 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
@@ -1412,14 +1412,6 @@ void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) { |
} |
void LocationBarView::OnFocus() { |
Peter Kasting
2014/05/06 21:28:33
Is it possible to remove this function entirely an
Daniel Erat
2014/05/07 18:43:02
seems to work for chrome os and linux. dominic, wo
|
- // Focus the view widget first which implements accessibility for |
- // Chrome OS. It is noop on Win. This should be removed once |
- // Chrome OS migrates to aura, which uses Views' textfield that receives |
- // focus. See crbug.com/106428. |
- NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, false); |
- |
- // Then focus the native location view which implements accessibility for |
- // Windows. |
omnibox_view_->SetFocus(); |
} |
@@ -1449,11 +1441,12 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) { |
void LocationBarView::PaintChildren(gfx::Canvas* canvas) { |
// Paint all the children except for the origin chip and the search button, |
// which will be painted after the border. |
- for (int i = 0, count = child_count(); i < count; ++i) |
+ for (int i = 0, count = child_count(); i < count; ++i) { |
if (!child_at(i)->layer() && |
(child_at(i) != origin_chip_view_) && |
(child_at(i) != search_button_)) |
child_at(i)->Paint(canvas); |
+ } |
// For non-InstantExtendedAPI cases, if necessary, show focus rect. As we need |
// the focus rect to appear on top of children we paint here rather than |