Commit 210d8bb5 authored by Finnur Thorarinsson's avatar Finnur Thorarinsson Committed by Commit Bot

Speculative fix for two FindInPageController tests.

FindInPageControllerTest.FindMovesOnTabClose_Issue1343052
FindInPageControllerTest.FindMovesWhenObscuring

This CL effectively reverts two CLs:
https://chromium-review.googlesource.com/c/chromium/src/+/2031539
https://chromium-review.googlesource.com/c/chromium/src/+/2028737

If the test fails as a result of this CL then the view.cc changes are
not to blame for and this CL should be reverted.

TBR: kylixrd
Bug: 1041614, 1047427
Change-Id: I66191af28e988ded2a304fa14e2254c1248257be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2035372Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737763}
parent a0cd7377
...@@ -951,9 +951,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, ...@@ -951,9 +951,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
} }
// Make sure Find box moves out of the way if it is obscuring the active match. // Make sure Find box moves out of the way if it is obscuring the active match.
// crbug.com/1047427: disabled due to flakiness IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindMovesWhenObscuring) {
IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
DISABLED_FindMovesWhenObscuring) {
GURL url = GetURL(kMoveIfOver); GURL url = GetURL(kMoveIfOver);
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
...@@ -1392,9 +1390,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) { ...@@ -1392,9 +1390,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) {
popup->window()->GetBounds().width()); popup->window()->GetBounds().width());
} }
// crbug.com/1047427: disabled due to flakiness.
IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
DISABLED_FindMovesOnTabClose_Issue1343052) { FindMovesOnTabClose_Issue1343052) {
EnsureFindBoxOpen(); EnsureFindBoxOpen();
content::RunAllPendingInMessageLoop(); // Needed on Linux. content::RunAllPendingInMessageLoop(); // Needed on Linux.
......
...@@ -2196,6 +2196,12 @@ void View::AddChildViewAtImpl(View* view, int index) { ...@@ -2196,6 +2196,12 @@ void View::AddChildViewAtImpl(View* view, int index) {
// inherit the visibility of the owner View. // inherit the visibility of the owner View.
view->UpdateLayerVisibility(); view->UpdateLayerVisibility();
if (widget) {
const ui::NativeTheme* new_theme = view->GetNativeTheme();
if (new_theme != old_theme)
view->PropagateThemeChanged();
}
// Need to notify the layout manager because one of the callbacks below might // Need to notify the layout manager because one of the callbacks below might
// want to know the view's new preferred size, minimum size, etc. // want to know the view's new preferred size, minimum size, etc.
if (layout_manager_) if (layout_manager_)
...@@ -2208,12 +2214,6 @@ void View::AddChildViewAtImpl(View* view, int index) { ...@@ -2208,12 +2214,6 @@ void View::AddChildViewAtImpl(View* view, int index) {
view->PropagateAddNotifications(details, widget && widget != old_widget); view->PropagateAddNotifications(details, widget && widget != old_widget);
if (widget) {
const ui::NativeTheme* new_theme = view->GetNativeTheme();
if (new_theme != old_theme)
view->PropagateThemeChanged();
}
UpdateTooltip(); UpdateTooltip();
if (widget) { if (widget) {
......
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