Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/profiles/avatar_menu_model.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/profiles/avatar_menu_model.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 void OnProfileCreated(bool always_create,
+                      chrome::HostDesktopType desktop_type,
                       Profile* profile,
                       Profile::CreateStatus status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
         chrome::startup::IS_NOT_PROCESS_STARTUP,
         chrome::startup::IS_NOT_FIRST_RUN,
+        desktop_type,
         always_create);
   }
 }
 
 }  // namespace
 
 AvatarMenuModel::AvatarMenuModel(ProfileInfoInterface* profile_cache,
                                  AvatarMenuModelObserver* observer,
                                  Browser* browser)
     : profile_info_(profile_cache),
@@ skipping 22 matching lines @@
 }
 
 AvatarMenuModel::Item::~Item() {
 }
 
 void AvatarMenuModel::SwitchToProfile(size_t index, bool always_create) {
   DCHECK(ProfileManager::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
   const Item& item = GetItemAt(index);
   FilePath path = profile_info_->GetPathOfProfileAtIndex(item.model_index);
+
+  chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
+  if (browser_) {
+    desktop_type = browser_->host_desktop_type();
+  }
+
   g_browser_process->profile_manager()->CreateProfileAsync(
-      path, base::Bind(&OnProfileCreated, always_create), string16(),
+      path,
+      base::Bind(&OnProfileCreated,
+                 always_create,
+                 desktop_type),
+      string16(),
       string16());
 
   ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
 }
 
 void AvatarMenuModel::EditProfile(size_t index) {
   Browser* browser = browser_;
   if (!browser) {
     Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
         profile_info_->GetPathOfProfileAtIndex(GetItemAt(index).model_index));
     browser = new Browser(Browser::CreateParams(profile));
   }
   std::string page = chrome::kManageProfileSubPage;
   page += "#";
   page += base::IntToString(static_cast<int>(index));
   chrome::ShowSettingsSubPage(browser, page);
 }
 
 void AvatarMenuModel::AddNewProfile() {
+  chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
+  if (browser_) {
+    desktop_type = browser_->host_desktop_type();
+  }
+
   ProfileManager::CreateMultiProfileAsync(
-      string16(), string16(), ProfileManager::CreateCallback());
+      string16(), string16(), ProfileManager::CreateCallback(), desktop_type);
   ProfileMetrics::LogProfileAddNewUser(ProfileMetrics::ADD_NEW_USER_ICON);
 }
 
 size_t AvatarMenuModel::GetNumberOfItems() {
   return items_.size();
 }
 
 size_t AvatarMenuModel::GetActiveProfileIndex() {
   // During singleton profile deletion, this function can be called with no
   // profiles in the model - crbug.com/102278 .
@@ skipping 57 matching lines @@
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }