Commit d3792f42 authored by Olesia Marukhno's avatar Olesia Marukhno Committed by Commit Bot

Fix permission chip traversal order

Bug: 1150365
Change-Id: I94c3ce6a04815a6789934e18c4565834ad5f46d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2546981
Commit-Queue: Olesia Marukhno <olesiamarukhno@google.com>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828720}
parent 64c79da0
...@@ -181,6 +181,8 @@ void LocationBarView::Init() { ...@@ -181,6 +181,8 @@ void LocationBarView::Init() {
const gfx::FontList& font_list = views::style::GetFont( const gfx::FontList& font_list = views::style::GetFont(
CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY); CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY);
permission_chip_ = AddChildView(std::make_unique<PermissionChip>(browser()));
auto location_icon_view = auto location_icon_view =
std::make_unique<LocationIconView>(font_list, this, this); std::make_unique<LocationIconView>(font_list, this, this);
location_icon_view->set_drag_controller(this); location_icon_view->set_drag_controller(this);
...@@ -309,8 +311,6 @@ void LocationBarView::Init() { ...@@ -309,8 +311,6 @@ void LocationBarView::Init() {
clear_all_button_ = AddChildView(std::move(clear_all_button)); clear_all_button_ = AddChildView(std::move(clear_all_button));
RefreshClearAllButtonIcon(); RefreshClearAllButtonIcon();
permission_chip_ = AddChildView(std::make_unique<PermissionChip>(browser()));
// Initialize the location entry. We do this to avoid a black flash which is // Initialize the location entry. We do this to avoid a black flash which is
// visible when the location entry has just been initialized. // visible when the location entry has just been initialized.
Update(nullptr); Update(nullptr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment