Revert of Remove HostDesktopType from AppLaunchParams

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 64 matching lines @@
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
 // Shows either the help app or the appropriate help page for |source|. If
 // |browser| is NULL and the help page is used (vs the app), the help page is
 // shown in the last active browser. If there is no such browser, a new browser
 // is created.
 void ShowHelpImpl(Browser* browser,
                   Profile* profile,
+                  HostDesktopType host_desktop_type,
                   HelpSource source) {
   content::RecordAction(UserMetricsAction("ShowHelpTab"));
 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
           genius_app::kGeniusAppId,
           extensions::ExtensionRegistry::EVERYTHING);
   extensions::AppLaunchSource app_launch_source(extensions::SOURCE_UNTRACKED);
   switch (source) {
     case HELP_SOURCE_KEYBOARD:
       app_launch_source = extensions::SOURCE_KEYBOARD;
       break;
     case HELP_SOURCE_MENU:
       app_launch_source = extensions::SOURCE_SYSTEM_TRAY;
       break;
     case HELP_SOURCE_WEBUI:
       app_launch_source = extensions::SOURCE_ABOUT_PAGE;
       break;
     default:
       NOTREACHED() << "Unhandled help source" << source;
   }
-  AppLaunchParams params(profile, extension, CURRENT_TAB, app_launch_source);
+  AppLaunchParams params(profile, extension, CURRENT_TAB, host_desktop_type,
+                         app_launch_source);
   OpenApplication(params);
 #else
   GURL url;
   switch (source) {
     case HELP_SOURCE_KEYBOARD:
       url = GURL(kChromeHelpViaKeyboardURL);
       break;
     case HELP_SOURCE_MENU:
       url = GURL(kChromeHelpViaMenuURL);
       break;
@@ skipping 79 matching lines @@
       return;
     }
   }
 #endif
 
   content::RecordAction(UserMetricsAction("AboutConflicts"));
   ShowSingletonTab(browser, GURL(kChromeUIConflictsURL));
 }
 
 void ShowHelp(Browser* browser, HelpSource source) {
-  ShowHelpImpl(browser, browser->profile(), source);
+  ShowHelpImpl(
+      browser, browser->profile(), browser->host_desktop_type(), source);
 }
 
-void ShowHelpForProfile(Profile* profile, HelpSource source) {
-  ShowHelpImpl(NULL, profile, source);
+void ShowHelpForProfile(Profile* profile,
+                        HostDesktopType host_desktop_type,
+                        HelpSource source) {
+  ShowHelpImpl(NULL, profile, host_desktop_type, source);
 }
 
 void ShowPolicy(Browser* browser) {
   ShowSingletonTab(browser, GURL(kChromeUIPolicyURL));
 }
 
 void ShowSlow(Browser* browser) {
 #if defined(OS_CHROMEOS)
   ShowSingletonTab(browser, GURL(kChromeUISlowURL));
 #endif
@@ skipping 181 matching lines @@
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome