Remove the rest of HostDesktopType from c/b/ui/browser_finder.h

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 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/ui/startup/startup_browser_creator.h"
 
 #include <stddef.h>
 
 #include <algorithm>   // For max().
 #include <set>
@@ skipping 148 matching lines @@
         NOTREACHED();
     }
   }
 
   bool HasBeenLaunched(const Profile* profile) const {
     return launched_profiles_.find(profile) != launched_profiles_.end();
   }
 
   void AddLaunched(Profile* profile) {
     launched_profiles_.insert(profile);
-    // Since the startup code only executes for browsers launched in
-    // desktop mode, i.e., HOST_DESKTOP_TYPE_NATIVE. Ash should never get here.
-    if (chrome::FindBrowserWithProfile(profile,
-                                       chrome::HOST_DESKTOP_TYPE_NATIVE)) {
+    if (chrome::FindBrowserWithProfile(profile)) {
       // A browser may get opened before we get initialized (e.g., in tests),
       // so we never see the NOTIFICATION_BROWSER_WINDOW_READY for it.
       opened_profiles_.insert(profile);
     }
   }
 
   void Clear() {
     launched_profiles_.clear();
     opened_profiles_.clear();
   }
@@ skipping 26 matching lines @@
     // Avoid posting more than once before ActivateProfile gets called.
     registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                       content::NotificationService::AllSources());
     registrar_.Remove(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                       content::NotificationService::AllSources());
   }
 
   void ActivateProfile() {
     // We need to test again, in case the profile got deleted in the mean time.
     if (profile_to_activate_) {
-      Browser* browser = chrome::FindBrowserWithProfile(
-          profile_to_activate_, chrome::HOST_DESKTOP_TYPE_NATIVE);
+      Browser* browser = chrome::FindBrowserWithProfile(profile_to_activate_);
       // |profile| may never get launched, e.g., if it only had
       // incognito Windows and one of them was used to exit Chrome.
       // So it won't have a browser in that case.
       if (browser)
         browser->window()->Activate();
       // No need try to activate this profile again.
       profile_to_activate_ = NULL;
     }
     // Assign true here, even if no browser was actually activated, so that
     // the test can stop waiting, and fail gracefully when needed.
@@ skipping 48 matching lines @@
       last_used_profile->GetPath());
 
   if (profile_index == std::string::npos ||
       !profile_info.ProfileIsSigninRequiredAtIndex(profile_index)) {
     // Signin is not required. However, guest, system or locked profiles cannot
     // be re-opened on startup. The only exception is if there's already a Guest
     // window open in a separate process (for example, launching a new browser
     // after clicking on a downloaded file in Guest mode).
     if ((!last_used_profile->IsGuestSession() &&
          !last_used_profile->IsSystemProfile()) ||
-        (chrome::GetTotalBrowserCountForProfile(
-           last_used_profile->GetOffTheRecordProfile()) > 0)) {
+        (chrome::GetBrowserCount(last_used_profile->GetOffTheRecordProfile()) >
+         0)) {
       return false;
     }
   }
 
   // Show the User Manager.
   profiles::UserManagerProfileSelected action =
       command_line.HasSwitch(switches::kShowAppList) ?
           profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER :
           profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION;
   UserManager::Show(
@@ skipping 419 matching lines @@
       !IncognitoModePrefs::ShouldLaunchIncognito(
           command_line, last_used_profile->GetPrefs())) {
     if (!ProcessLoadApps(command_line, cur_dir, last_used_profile))
       return false;
 
     // Return early here to avoid opening a browser window.
     // The exception is when there are no browser windows, since we don't want
     // chrome to shut down.
     // TODO(jackhou): Do this properly once keep-alive is handled by the
     // background page of apps. Tracked at http://crbug.com/175381
-    if (chrome::GetTotalBrowserCountForProfile(last_used_profile) != 0)
+    if (chrome::GetBrowserCount(last_used_profile) != 0)
       return true;
   }
 
   // Check for --load-and-launch-app.
   if (command_line.HasSwitch(apps::kLoadAndLaunchApp) &&
       !IncognitoModePrefs::ShouldLaunchIncognito(
           command_line, last_used_profile->GetPrefs())) {
     base::CommandLine::StringType path =
         command_line.GetSwitchValueNative(apps::kLoadAndLaunchApp);
 
     if (!apps::AppLoadService::Get(last_used_profile)->LoadAndLaunch(
             base::FilePath(path), command_line, cur_dir)) {
       return false;
     }
 
     // Return early here since we don't want to open a browser window.
     // The exception is when there are no browser windows, since we don't want
     // chrome to shut down.
     // TODO(jackhou): Do this properly once keep-alive is handled by the
     // background page of apps. Tracked at http://crbug.com/175381
-    if (chrome::GetTotalBrowserCountForProfile(last_used_profile) != 0)
+    if (chrome::GetBrowserCount(last_used_profile) != 0)
       return true;
   }
 
 #if defined(OS_WIN)
   // Intercept a specific url when setting the default browser asynchronously.
   // This only happens on Windows 10+.
   if (g_default_browser_callback) {
     base::CommandLine::StringType default_browser_url_(
         kSetDefaultBrowserHelpUrl);
     for (const auto& arg : command_line.GetArgs()) {
@@ skipping 174 matching lines @@
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
     return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }