chrome/browser/sessions/better_session_restore_browsertest.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/sessions/better_session_restore_browsertest.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/safe_browsing/srt_global_error_win.cc ('k') | chrome/browser/sessions/in_memory_tab_restore_service.h » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/better_session_restore_browsertest.cc

diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc

index 7b15d5ca60bae65a55edd5677938c55daf258c66..ef75a8ddaad2c4d8dc5e33ecd0b7a94e90be91c1 100644

--- a/chrome/browser/sessions/better_session_restore_browsertest.cc

+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc

@@ -328,7 +328,7 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {

// Create a new window, which should trigger session restore.

ui_test_utils::BrowserAddedObserver window_observer;

- chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);

+ chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);

Browser* new_browser = window_observer.WaitForSingleNewBrowser();

chrome::DecrementKeepAliveCount();

@@ -483,9 +483,7 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest,

// which stores a session cookie.

StoreDataWithPage("session_cookies.html");

Browser* popup = new Browser(Browser::CreateParams(

- Browser::TYPE_POPUP,

- browser()->profile(),

- chrome::HOST_DESKTOP_TYPE_NATIVE));

+ Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));

popup->window()->Show();

Browser* new_browser = QuitBrowserAndRestore(browser(), false);

@@ -768,9 +766,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest,

SessionCookiesBrowserCloseWithPopupOpen) {

StoreDataWithPage("session_cookies.html");

Browser* popup = new Browser(Browser::CreateParams(

- Browser::TYPE_POPUP,

- browser()->profile(),

- chrome::HOST_DESKTOP_TYPE_NATIVE));

+ Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));

popup->window()->Show();

Browser* new_browser = QuitBrowserAndRestore(browser(), false);

NavigateAndCheckStoredData(new_browser, "session_cookies.html");

@@ -782,9 +778,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest,

SessionCookiesBrowserClosePopupLast) {

StoreDataWithPage("session_cookies.html");

Browser* popup = new Browser(Browser::CreateParams(

- Browser::TYPE_POPUP,

- browser()->profile(),

- chrome::HOST_DESKTOP_TYPE_NATIVE));

+ Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));

popup->window()->Show();

CloseBrowserSynchronously(browser());

Browser* new_browser = QuitBrowserAndRestore(popup, false);