Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 882 matching lines @@
                                    *GetProfilesInfoList());
 }
 
 void BrowserOptionsHandler::CreateProfile(const ListValue* args) {
   // This handler could have been called in managed mode, for example because
   // the user fiddled with the web inspector. Silently return in this case.
   if (!ProfileManager::IsMultipleProfilesEnabled())
     return;
   string16 name, icon;
   bool create_box_checked;
+
+  Browser* browser =
+      browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
+  chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
+  if (browser)
+    desktop_type = browser->host_desktop_type();
+
   if (args->GetString(0, &name) && args->GetString(1, &icon)) {
     if (args->GetBoolean(2, &create_box_checked) && create_box_checked) {
       ProfileManager::CreateMultiProfileAsync(
-        name, icon, base::Bind(&CreateDesktopShortcutForProfile));
+        name, icon, base::Bind(&CreateDesktopShortcutForProfile), desktop_type);
     } else {
       ProfileManager::CreateMultiProfileAsync(
-        name, icon, ProfileManager::CreateCallback());
+        name, icon, ProfileManager::CreateCallback(), desktop_type);
     }
   } else {
     ProfileManager::CreateMultiProfileAsync(
-        string16(), string16(), ProfileManager::CreateCallback());
+        string16(), string16(), ProfileManager::CreateCallback(), desktop_type);
   }
 }
 
 void BrowserOptionsHandler::CreateProfileInfo(const ListValue* args) {
   DictionaryValue* profile_info = new DictionaryValue();
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   size_t icon_index = cache.ChooseAvatarIconIndexForNewProfile();
 
@@ skipping 421 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options