| Index: chrome/browser/sessions/session_restore.cc
|
| diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
|
| index aca211c8d7bfe979dff23c9fc44f7a8ff4296d36..5514241634238d4311b6d6209e797547d89f8444 100644
|
| --- a/chrome/browser/sessions/session_restore.cc
|
| +++ b/chrome/browser/sessions/session_restore.cc
|
| @@ -80,7 +80,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
|
| public:
|
| SessionRestoreImpl(Profile* profile,
|
| Browser* browser,
|
| - chrome::HostDesktopType host_desktop_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| bool synchronous,
|
| bool clobber_existing_tab,
|
| bool always_create_tabbed_browser,
|
| @@ -695,7 +695,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
|
|
|
| // The desktop on which all new browsers should be created (browser_, if it is
|
| // not NULL, must be of this desktop type as well).
|
| - chrome::HostDesktopType host_desktop_type_;
|
| + ui::HostDesktopType host_desktop_type_;
|
|
|
| // Whether or not restore is synchronous.
|
| const bool synchronous_;
|
| @@ -744,12 +744,11 @@ class SessionRestoreImpl : public content::NotificationObserver {
|
| // SessionRestore -------------------------------------------------------------
|
|
|
| // static
|
| -Browser* SessionRestore::RestoreSession(
|
| - Profile* profile,
|
| - Browser* browser,
|
| - chrome::HostDesktopType host_desktop_type,
|
| - uint32 behavior,
|
| - const std::vector<GURL>& urls_to_open) {
|
| +Browser* SessionRestore::RestoreSession(Profile* profile,
|
| + Browser* browser,
|
| + ui::HostDesktopType host_desktop_type,
|
| + uint32 behavior,
|
| + const std::vector<GURL>& urls_to_open) {
|
| #if defined(OS_CHROMEOS)
|
| chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker(
|
| "SessionRestore-Start", false);
|
| @@ -794,7 +793,7 @@ void SessionRestore::RestoreSessionAfterCrash(Browser* browser) {
|
| // static
|
| std::vector<Browser*> SessionRestore::RestoreForeignSessionWindows(
|
| Profile* profile,
|
| - chrome::HostDesktopType host_desktop_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| std::vector<const sessions::SessionWindow*>::const_iterator begin,
|
| std::vector<const sessions::SessionWindow*>::const_iterator end) {
|
| std::vector<GURL> gurls;
|
|
|