Remove HostDesktopType from FindLastActive[WithProfile]

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 407 matching lines @@
   canvas.DrawImageInt(*icon.ToImageSkia(), 0, 0);
 
   gfx::CalculateFaviconTargetSize(&width, &height);
   gfx::Image sized_icon = profiles::GetSizedAvatarIcon(
       gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep())), true, width,
       height);
   menu->SetIcon(menu->GetItemCount() - 1, sized_icon);
 }
 #endif  // !defined(OS_CHROMEOS)
 
-void OnProfileCreated(chrome::HostDesktopType desktop_type,
-                      const GURL& link_url,
+void OnProfileCreated(const GURL& link_url,
                       const content::Referrer& referrer,
                       Profile* profile,
                       Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
-    Browser* browser = chrome::FindLastActiveWithProfile(profile, desktop_type);
+    Browser* browser = chrome::FindLastActiveWithProfile(profile);
     chrome::NavigateParams nav_params(browser, link_url,
                                       ui::PAGE_TRANSITION_LINK);
     nav_params.disposition = NEW_FOREGROUND_TAB;
     nav_params.referrer = referrer;
     nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
     chrome::Navigate(&nav_params);
   }
 }
 
 }  // namespace
@@ skipping 446 matching lines @@
     // time.
     // TODO(jochen): Consider adding support for ChromeOS with similar
     // semantics as the profile switcher in the system tray.
 #if !defined(OS_CHROMEOS)
     // g_browser_process->profile_manager() is null during unit tests.
     if (g_browser_process->profile_manager() &&
         GetProfile()->GetProfileType() == Profile::REGULAR_PROFILE) {
       ProfileManager* profile_manager = g_browser_process->profile_manager();
       const ProfileInfoCache& profile_info_cache =
           profile_manager->GetProfileInfoCache();
-      chrome::HostDesktopType desktop_type =
-          chrome::GetHostDesktopTypeForNativeView(
-              source_web_contents_->GetNativeView());
 
       // Find all regular profiles other than the current one which have at
       // least one open window.
       std::vector<size_t> target_profiles;
       const size_t profile_count = profile_info_cache.GetNumberOfProfiles();
       for (size_t profile_index = 0; profile_index < profile_count;
            ++profile_index) {
         base::FilePath profile_path =
             profile_info_cache.GetPathOfProfileAtIndex(profile_index);
         Profile* profile = profile_manager->GetProfileByPath(profile_path);
         if ((profile != GetProfile()) &&
             !profile_info_cache.IsOmittedProfileAtIndex(profile_index) &&
             !profile_info_cache.ProfileIsSigninRequiredAtIndex(profile_index)) {
           target_profiles.push_back(profile_index);
-          if (chrome::FindLastActiveWithProfile(profile, desktop_type))
+          if (chrome::FindLastActiveWithProfile(profile))
             multiple_profiles_open_ = true;
         }
       }
 
       if (!target_profiles.empty()) {
         UMA_HISTOGRAM_ENUMERATION("RenderViewContextMenu.OpenLinkAsUserShown",
                                   target_profiles.size(),
                                   kOpenLinkAsUserMaxProfilesReported);
       }
 
@@ skipping 732 matching lines @@
         profile_manager->GetProfileInfoCache();
 
     base::FilePath profile_path = profile_info_cache.GetPathOfProfileAtIndex(
         id - IDC_OPEN_LINK_IN_PROFILE_FIRST);
     chrome::HostDesktopType desktop_type =
         chrome::GetHostDesktopTypeForNativeView(
             source_web_contents_->GetNativeView());
 
     Profile* profile = profile_manager->GetProfileByPath(profile_path);
     UmaEnumOpenLinkAsUser profile_state;
-    if (chrome::FindLastActiveWithProfile(profile, desktop_type)) {
+    if (chrome::FindLastActiveWithProfile(profile)) {
       profile_state = OPEN_LINK_AS_USER_ACTIVE_PROFILE_ENUM_ID;
     } else if (multiple_profiles_open_) {
       profile_state =
           OPEN_LINK_AS_USER_INACTIVE_PROFILE_MULTI_PROFILE_SESSION_ENUM_ID;
     } else {
       profile_state =
           OPEN_LINK_AS_USER_INACTIVE_PROFILE_SINGLE_PROFILE_SESSION_ENUM_ID;
     }
     UMA_HISTOGRAM_ENUMERATION("RenderViewContextMenu.OpenLinkAsUser",
                               profile_state, OPEN_LINK_AS_USER_LAST_ENUM_ID);
 
     profiles::SwitchToProfile(
         profile_path, desktop_type, false,
-        base::Bind(OnProfileCreated, desktop_type, params_.link_url,
+        base::Bind(OnProfileCreated, params_.link_url,
                    CreateReferrer(params_.link_url, params_)),
         ProfileMetrics::SWITCH_PROFILE_CONTEXT_MENU);
     return;
   }
 
   switch (id) {
     case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB: {
       Browser* browser =
           chrome::FindBrowserWithWebContents(source_web_contents_);
       OpenURL(params_.link_url,
@@ skipping 487 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }