chrome/browser/extensions/extension_tab_util.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/extension_tab_util.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_process_manager_delegate.cc ('k') | chrome/browser/extensions/external_install_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tab_util.cc

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

index f68cb15ae6ddc252f5c2ffc34879d13f842d3c30..109aa9319b740ab47a9baf909b935630254cceae 100644

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

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

@@ -151,9 +151,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(

// Ensure the selected browser is tabbed.

if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())

browser = chrome::FindTabbedBrowser(function->GetProfile(),

- function->include_incognito(),

- browser->host_desktop_type());

+ function->include_incognito());

if (!browser || !browser->window()) {

if (error)

*error = keys::kNoCurrentWindowError;

@@ -225,7 +223,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(

Profile* profile = browser->profile()->GetOriginalProfile();

chrome::HostDesktopType desktop_type = browser->host_desktop_type();

- browser = chrome::FindTabbedBrowser(profile, false, desktop_type);

+ browser = chrome::FindTabbedBrowser(profile, false);

if (!browser) {

browser = new Browser(

Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));

@@ -595,7 +593,7 @@ void ExtensionTabUtil::CreateTab(WebContents* web_contents,

Profile* profile =

Profile::FromBrowserContext(web_contents->GetBrowserContext());

chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();

- Browser* browser = chrome::FindTabbedBrowser(profile, false, active_desktop);

+ Browser* browser = chrome::FindTabbedBrowser(profile, false);

const bool browser_created = !browser;

if (!browser)

browser = new Browser(Browser::CreateParams(profile, active_desktop));