chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc - Issue 1659203002: Remove HostDesktopType from FindLastActive[WithProfile]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

Issue 1659203002: Remove HostDesktopType from FindLastActive[WithProfile] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nullptr Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

index a14af178518f31a98803b3579bd8f89f7950c63d..e7bda7989ef36931f24809ad292c399df962f597 100644

--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

@@ -107,9 +107,8 @@ class CloseObserver : public content::WebContentsObserver {

class BrowserActivationObserver : public chrome::BrowserListObserver {

public:

- explicit BrowserActivationObserver(chrome::HostDesktopType desktop_type)

- : browser_(chrome::FindLastActiveWithHostDesktopType(desktop_type)),

- observed_(false) {

+ BrowserActivationObserver()

+ : browser_(chrome::FindLastActive()), observed_(false) {

BrowserList::AddObserver(this);

}

~BrowserActivationObserver() override { BrowserList::RemoveObserver(this); }

@@ -580,8 +579,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ModalPopUnder) {

NavigateAndCheckPopupShown(url, ExpectPopup);

- Browser* popup_browser =

- chrome::FindLastActiveWithHostDesktopType(browser()->host_desktop_type());

+ Browser* popup_browser = chrome::FindLastActive();

ASSERT_NE(popup_browser, browser());

// Showing an alert will raise the tab over the popup.

@@ -593,15 +591,12 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ModalPopUnder) {

app_modal::JavaScriptAppModalDialog* js_dialog =

static_cast<app_modal::JavaScriptAppModalDialog*>(dialog);

- BrowserActivationObserver activation_observer(browser()->host_desktop_type());

+ BrowserActivationObserver activation_observer;

js_dialog->native_dialog()->AcceptAppModalDialog();

- if (popup_browser != chrome::FindLastActiveWithHostDesktopType(

- popup_browser->host_desktop_type())) {

+ if (popup_browser != chrome::FindLastActive())

activation_observer.WaitForActivation();

- }

- ASSERT_EQ(popup_browser, chrome::FindLastActiveWithHostDesktopType(

- popup_browser->host_desktop_type()));

+ ASSERT_EQ(popup_browser, chrome::FindLastActive());

}

void BuildSimpleWebKeyEvent(blink::WebInputEvent::Type type,