chrome/browser/extensions/chrome_extension_function_details.cc - Issue 1661713002: Remove the rest of HostDesktopType from c/b/ui/browser_finder.h

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/chrome_extension_function_details.cc

Issue 1661713002: Remove the rest of HostDesktopType from c/b/ui/browser_finder.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-11

Patch Set: linux adl 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/extensions/chrome_extension_function.cc ('k') | chrome/browser/extensions/chrome_process_manager_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_extension_function_details.cc

diff --git a/chrome/browser/extensions/chrome_extension_function_details.cc b/chrome/browser/extensions/chrome_extension_function_details.cc

index 5d2e480bb9675c45f4c8fa23c66292b3a01e03c5..7ebed1459019678b580b8ee41d466de02298070c 100644

--- a/chrome/browser/extensions/chrome_extension_function_details.cc

+++ b/chrome/browser/extensions/chrome_extension_function_details.cc

@@ -59,8 +59,8 @@ Browser* ChromeExtensionFunctionDetails::GetCurrentBrowser() const {

if (function_->render_frame_host()) {

Profile* profile = Profile::FromBrowserContext(

function_->render_frame_host()->GetProcess()->GetBrowserContext());

- Browser* browser = chrome::FindAnyBrowser(

- profile, function_->include_incognito(), chrome::GetActiveDesktop());

+ Browser* browser =

+ chrome::FindAnyBrowser(profile, function_->include_incognito());

if (browser)

return browser;

}

@@ -155,7 +155,6 @@ gfx::NativeWindow ChromeExtensionFunctionDetails::GetNativeWindowForUI() {

if (contents)

return contents->GetTopLevelNativeWindow();

- Browser* browser =

- chrome::FindBrowserWithProfile(GetProfile(), chrome::GetActiveDesktop());

+ Browser* browser = chrome::FindBrowserWithProfile(GetProfile());

return browser->window()->GetNativeWindow();

}