Commit 0ff4b9c0 authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[UI Cleanup] Use WidgetActivationWaiter in lieu of custom waiter

Use WidgetActivationWaiter instead of a custom WindowDeactivatedWaiter
in tabs/tab_hover_card_bubble_view_browsertest.cc. This is less code
and reuses a common utility.

Bonus: It fixes a small typo. :)

Bug: None
Change-Id: I09c2202ebe2b79dc7c0397d7cb59b2253e353377
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151673Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarCaroline Rising <corising@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760086}
parent 5b8ac5fb
......@@ -27,31 +27,6 @@
using views::Widget;
// Helper to wait until a window is deactivated.
class WindowDeactivedWaiter : public views::WidgetObserver {
public:
explicit WindowDeactivedWaiter(BrowserView* window) : window_(window) {
window_->frame()->AddObserver(this);
}
~WindowDeactivedWaiter() override { window_->frame()->RemoveObserver(this); }
void Wait() {
if (!window_->IsActive())
return;
run_loop_.Run();
}
// WidgetObserver overrides:
void OnWidgetActivationChanged(Widget* widget, bool active) override {
if (!active)
run_loop_.Quit();
}
private:
BrowserView* const window_;
base::RunLoop run_loop_;
};
class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest {
public:
TabHoverCardBubbleViewBrowserTest()
......@@ -318,8 +293,8 @@ IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewBrowserTest,
ASSERT_EQ(2u, active_browser_list_->size());
Browser* active_window = active_browser_list_->get(0);
Browser* inactive_window = active_browser_list_->get(1);
WindowDeactivedWaiter waiter(
BrowserView::GetBrowserViewForBrowser(inactive_window));
views::test::WidgetActivationWaiter waiter(
BrowserView::GetBrowserViewForBrowser(inactive_window)->frame(), false);
BrowserView::GetBrowserViewForBrowser(active_window)->Activate();
waiter.Wait();
ASSERT_FALSE(
......
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