chrome/browser/extensions/api/extension_action/extension_action_api.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/extensions/api/extension_action/extension_action_api.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/download/download_ui_controller.cc ('k') | chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

index fcca92186379f7f597be774b983dca442c75efe5..1af27cb18542297342f1d8844727de3d8da819b1 100644

--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

@@ -616,8 +616,7 @@ BrowserActionOpenPopupFunction::BrowserActionOpenPopupFunction()

bool BrowserActionOpenPopupFunction::RunAsync() {

// We only allow the popup in the active window.

Profile* profile = GetProfile();

- Browser* browser = chrome::FindLastActiveWithProfile(

- profile, chrome::GetActiveDesktop());

+ Browser* browser = chrome::FindLastActiveWithProfile(profile);

// It's possible that the last active browser actually corresponds to the

// associated incognito profile, and this won't be returned by

// FindLastActiveWithProfile. If the browser we found isn't active and the

@@ -625,8 +624,8 @@ bool BrowserActionOpenPopupFunction::RunAsync() {

if ((!browser || !browser->window()->IsActive()) &&

util::IsIncognitoEnabled(extension()->id(), profile) &&

profile->HasOffTheRecordProfile()) {

- browser = chrome::FindLastActiveWithProfile(

- profile->GetOffTheRecordProfile(), chrome::GetActiveDesktop());

+ browser =

+ chrome::FindLastActiveWithProfile(profile->GetOffTheRecordProfile());

}

// If there's no active browser, or the Toolbar isn't visible, abort.