chrome/browser/ui/startup/startup_browser_creator_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/ui/startup/startup_browser_creator_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/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.h » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

index e5a280543a0d81a9e7706cb24b359618d88ae3db..092409c178d65b2bbfc7fdc756193f8e987d87ef 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -225,7 +225,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,

urls.push_back(test_server()->GetURL("files/title2.html"));

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

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

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

// Set the startup preference to open these URLs.

SessionStartupPref pref(SessionStartupPref::URLS);

@@ -290,7 +290,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,

// time. Both the original browser created by the fixture and the one

// created above have been closed, so the new browser is the only one

// remaining.

- new_browser = FindTabbedBrowser(profile, true, host_desktop_type);

+ new_browser = chrome::FindTabbedBrowser(profile, true, host_desktop_type);

ASSERT_TRUE(new_browser);

ASSERT_EQ(static_cast<int>(urls.size()),

new_browser->tab_strip_model()->count());

@@ -960,8 +960,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,

CloseBrowserAsynchronously(browser_last);

// Close the main browser.

- chrome::HostDesktopType original_desktop_type =

- browser()->host_desktop_type();

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

CloseBrowserAsynchronously(browser());

// Do a simple non-process-startup browser launch.