| Index: chrome/browser/ui/startup/startup_browser_creator_impl.h
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h
|
| index 3fbaa104ffac85c727760d735adda55bbcb78eca..ecef228911e76839f35820bfe9999ce9e4bd4012 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h
|
| @@ -56,14 +56,14 @@ class StartupBrowserCreatorImpl {
|
| bool Launch(Profile* profile,
|
| const std::vector<GURL>& urls_to_open,
|
| bool process_startup,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| // Convenience for OpenTabsInBrowser that converts |urls| into a set of
|
| // Tabs.
|
| Browser* OpenURLsInBrowser(Browser* browser,
|
| bool process_startup,
|
| const std::vector<GURL>& urls,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs);
|
| @@ -83,7 +83,7 @@ class StartupBrowserCreatorImpl {
|
| Browser* OpenTabsInBrowser(Browser* browser,
|
| bool process_startup,
|
| const StartupTabs& tabs,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| // If the process was launched with the web application command line flags,
|
| // e.g. --app=http://www.google.com/ or --app_id=... return true.
|
| @@ -107,7 +107,7 @@ class StartupBrowserCreatorImpl {
|
| // . Open the urls directly.
|
| void ProcessLaunchURLs(bool process_startup,
|
| const std::vector<GURL>& urls_to_open,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| // Does the following:
|
| // . If the user's startup pref is to restore the last session (or the
|
| @@ -117,7 +117,7 @@ class StartupBrowserCreatorImpl {
|
| // If a browser was created, true is returned. Otherwise returns false and
|
| // the caller must create a new browser.
|
| bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| // Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle
|
| // processing of URLs where the behavior is common between process startup
|
| @@ -131,7 +131,7 @@ class StartupBrowserCreatorImpl {
|
| // If any tabs were opened, the Browser which was created is returned.
|
| // Otherwise null is returned and the caller must create a new browser.
|
| Browser* ProcessSpecifiedURLs(const std::vector<GURL>& urls_to_open,
|
| - chrome::HostDesktopType desktop_type);
|
| + ui::HostDesktopType desktop_type);
|
|
|
| // Adds a Tab to |tabs| for each url in |urls| that doesn't already exist
|
| // in |tabs|.
|
|
|