Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/sessions/session_restore.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 62 matching lines @@
 
 // SessionRestoreImpl ---------------------------------------------------------
 
 // SessionRestoreImpl is responsible for fetching the set of tabs to create
 // from SessionService. SessionRestoreImpl deletes itself when done.
 
 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,
                      const std::vector<GURL>& urls_to_open,
                      SessionRestore::CallbackList* callbacks)
       : profile_(profile),
         browser_(browser),
         host_desktop_type_(host_desktop_type),
         synchronous_(synchronous),
         clobber_existing_tab_(clobber_existing_tab),
@@ skipping 594 matching lines @@
   }
 
   // The profile to create the sessions for.
   Profile* profile_;
 
   // The first browser to restore to, may be null.
   Browser* browser_;
 
   // 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_;
 
   // The quit-closure to terminate the nested message-loop started for
   // synchronous session-restore.
   base::Closure quit_closure_for_sync_restore_;
 
   // See description of CLOBBER_CURRENT_TAB.
   const bool clobber_existing_tab_;
@@ skipping 28 matching lines @@
   SessionRestore::CallbackList* on_session_restored_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionRestoreImpl);
 };
 
 }  // namespace
 
 // 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);
 #endif
   DCHECK(profile);
   // Always restore from the original profile (incognito profiles have no
   // session service).
   profile = profile->GetOriginalProfile();
   if (!SessionServiceFactory::GetForProfile(profile)) {
     NOTREACHED();
@@ skipping 24 matching lines @@
     }
   }
   SessionRestore::RestoreSession(browser->profile(), browser,
                                  browser->host_desktop_type(), behavior,
                                  std::vector<GURL>());
 }
 
 // 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;
   SessionRestoreImpl restorer(profile, static_cast<Browser*>(nullptr),
                               host_desktop_type, true, false, true, gurls,
                               on_session_restored_callbacks());
   return restorer.RestoreForeignSession(begin, end);
 }
 
 // static
@@ skipping 50 matching lines @@
   if (prioritize_tabs == "mru")
     return SMART_RESTORE_MODE_MRU;
   if (prioritize_tabs == "simple")
     return SMART_RESTORE_MODE_SIMPLE;
   return SMART_RESTORE_MODE_OFF;
 }
 
 // static
 base::CallbackList<void(int)>*
     SessionRestore::on_session_restored_callbacks_ = nullptr;