chrome/browser/ui/webui/options/options_handlers_helper.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

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/webui/options/options_handlers_helper.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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/webui/options/options_handlers_helper.h ('k') | chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/options_handlers_helper.cc

diff --git a/chrome/browser/ui/webui/options/options_handlers_helper.cc b/chrome/browser/ui/webui/options/options_handlers_helper.cc

index 3f06176a77e2bc58530485abaa218fc6023ea057..eac67bc61ababc5f898662fb12f3ed1156452bf1 100644

--- a/chrome/browser/ui/webui/options/options_handlers_helper.cc

+++ b/chrome/browser/ui/webui/options/options_handlers_helper.cc

@@ -17,7 +17,7 @@

namespace options {

namespace helper {

-chrome::HostDesktopType GetDesktopType(content::WebUI* web_ui) {

+ui::HostDesktopType GetDesktopType(content::WebUI* web_ui) {

DCHECK(web_ui);

content::WebContents* web_contents = web_ui->GetWebContents();

Browser* browser = chrome::FindBrowserWithWebContents(web_contents);

@@ -35,7 +35,7 @@ chrome::HostDesktopType GetDesktopType(content::WebUI* web_ui) {

return chrome::GetActiveDesktop();

}

-void OpenNewWindowForProfile(chrome::HostDesktopType desktop_type,

+void OpenNewWindowForProfile(ui::HostDesktopType desktop_type,

Profile* profile,

Profile::CreateStatus status) {

if (status != Profile::CREATE_STATUS_INITIALIZED)