Remove HostDesktopType from Browser::CreateParams

chrome/browser/profiles/avatar_menu_actions_desktop.cc

 // Copyright 2013 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/profiles/avatar_menu_actions_desktop.h"
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 23 matching lines @@
 AvatarMenuActions* AvatarMenuActions::Create() {
   return new AvatarMenuActionsDesktop();
 }
 
 void AvatarMenuActionsDesktop::AddNewProfile(ProfileMetrics::ProfileAdd type) {
   // TODO: Remove dependency on Browser by delegating AddNewProfile and
   // and EditProfile actions.
 
   Browser* settings_browser = browser_;
   if (!settings_browser) {
-    const Browser::CreateParams params(ProfileManager::GetLastUsedProfile(),
-                                       chrome::GetActiveDesktop());
+    const Browser::CreateParams params(ProfileManager::GetLastUsedProfile());
     settings_browser = new Browser(params);
   }
   chrome::ShowSettingsSubPage(settings_browser, chrome::kCreateProfileSubPage);
   ProfileMetrics::LogProfileAddNewUser(type);
 }
 
 void AvatarMenuActionsDesktop::EditProfile(Profile* profile, size_t index) {
   Browser* settings_browser = browser_;
   if (!settings_browser) {
-    settings_browser = new Browser(
-        Browser::CreateParams(profile, chrome::GetActiveDesktop()));
+    settings_browser = new Browser(Browser::CreateParams(profile));
   }
   // TODO(davidben): The manageProfile page only allows editting the profile
   // associated with the browser it is opened in. AvatarMenuActionsDesktop
   // should account for this when picking a browser to open in.
   chrome::ShowSettingsSubPage(settings_browser, chrome::kManageProfileSubPage);
 }
 
 bool AvatarMenuActionsDesktop::ShouldShowAddNewProfileLink() const {
   // |browser_| can be NULL in unit_tests.
   if (browser_ && browser_->profile()->IsSupervised())
     return false;
 #if defined(OS_WIN)
   return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
 #else
   return true;
 #endif
 }
 
 bool AvatarMenuActionsDesktop::ShouldShowEditProfileLink() const {
 #if defined(OS_WIN)
   return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
 #else
   return true;
 #endif
 }
 
 void AvatarMenuActionsDesktop::ActiveBrowserChanged(Browser* browser) {
   browser_ = browser;
 }