chrome/browser/ui/ash/chrome_new_window_delegate.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/ash/chrome_new_window_delegate.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/ash/app_list/app_list_service_ash.cc ('k') | chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_new_window_delegate.cc

diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate.cc b/chrome/browser/ui/ash/chrome_new_window_delegate.cc

index 49dc9dc21e162873414e68bda2a97e2fe7989f8c..8b0f5bb17b1ef9fff02fb86eb20399ac60c92045 100644

--- a/chrome/browser/ui/ash/chrome_new_window_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_new_window_delegate.cc

@@ -20,7 +20,7 @@ namespace {

void RestoreTabUsingProfile(Profile* profile) {

TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);

- service->RestoreMostRecentEntry(NULL, chrome::HOST_DESKTOP_TYPE_ASH);

+ service->RestoreMostRecentEntry(NULL, ui::HOST_DESKTOP_TYPE_ASH);

}

// Returns the browser for the active window, if any.

@@ -84,7 +84,7 @@ void ChromeNewWindowDelegate::NewTab() {

// Display a browser, setting the focus to the location bar after it is shown.

{

chrome::ScopedTabbedBrowserDisplayer displayer(

- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);

+ ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);

browser = displayer.browser();

chrome::NewTab(browser);

}

@@ -96,7 +96,7 @@ void ChromeNewWindowDelegate::NewWindow(bool is_incognito) {

Profile* profile = ProfileManager::GetActiveUserProfile();

chrome::NewEmptyWindow(

is_incognito ? profile->GetOffTheRecordProfile() : profile,

- chrome::HOST_DESKTOP_TYPE_ASH);

+ ui::HOST_DESKTOP_TYPE_ASH);

}

void ChromeNewWindowDelegate::RestoreTab() {