chrome/browser/extensions/api/sessions/sessions_api.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/extensions/api/sessions/sessions_api.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/extensions/api/preferences_private/preferences_private_apitest.cc ('k') | chrome/browser/extensions/api/sessions/sessions_apitest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sessions/sessions_api.cc

diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc

index d081b47815dd6dad2f58e586f222604d022a8bef..ee8ab59b28477626686577907c00824e7f4c86c3 100644

--- a/chrome/browser/extensions/api/sessions/sessions_api.cc

+++ b/chrome/browser/extensions/api/sessions/sessions_api.cc

@@ -442,7 +442,7 @@ bool SessionsRestoreFunction::SetResultRestoredWindow(int window_id) {

bool SessionsRestoreFunction::RestoreMostRecentlyClosed(Browser* browser) {

TabRestoreService* tab_restore_service =

TabRestoreServiceFactory::GetForProfile(GetProfile());

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

+ ui::HostDesktopType host_desktop_type = browser->host_desktop_type();

TabRestoreService::Entries entries = tab_restore_service->entries();

if (entries.empty()) {

@@ -471,7 +471,7 @@ bool SessionsRestoreFunction::RestoreLocalSession(const SessionId& session_id,

Browser* browser) {

TabRestoreService* tab_restore_service =

TabRestoreServiceFactory::GetForProfile(GetProfile());

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

+ ui::HostDesktopType host_desktop_type = browser->host_desktop_type();

TabRestoreService::Entries entries = tab_restore_service->entries();

if (entries.empty()) {

@@ -561,7 +561,7 @@ bool SessionsRestoreFunction::RestoreForeignSession(const SessionId& session_id,

return false;

}

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

+ ui::HostDesktopType host_desktop_type = browser->host_desktop_type();

// Only restore one window at a time.

std::vector<Browser*> browsers = SessionRestore::RestoreForeignSessionWindows(

GetProfile(), host_desktop_type, window, window + 1);

@@ -575,7 +575,7 @@ bool SessionsRestoreFunction::RunSync() {

EXTENSION_FUNCTION_VALIDATE(params);

Browser* browser = chrome::FindBrowserWithProfile(

- GetProfile(), chrome::HOST_DESKTOP_TYPE_NATIVE);

+ GetProfile(), ui::HOST_DESKTOP_TYPE_NATIVE);

if (!browser) {

SetError(kNoBrowserToRestoreSession);

return false;