Remove HostDesktopType from some extensions files

chrome/browser/extensions/bookmark_app_helper.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/extensions/bookmark_app_helper.h"
 
 #include <stddef.h>
 
 #include <cctype>
 #include <string>
@@ skipping 684 matching lines @@
     callback_.Run(extension, web_app_info_);
     return;
   }
 
   // Pin the app to the relevant launcher depending on the OS.
   Profile* current_profile = profile_->GetOriginalProfile();
 
 // On Mac, shortcuts are automatically created for hosted apps when they are
 // installed, so there is no need to create them again.
 #if !defined(OS_MACOSX)
-  chrome::HostDesktopType desktop = browser->host_desktop_type();
-  if (desktop != chrome::HOST_DESKTOP_TYPE_ASH) {
-    web_app::ShortcutLocations creation_locations;
+#if !defined(USE_ASH)
+  web_app::ShortcutLocations creation_locations;
 #if defined(OS_LINUX) || defined(OS_WIN)
-    creation_locations.on_desktop = true;
+  creation_locations.on_desktop = true;
 #else
-    creation_locations.on_desktop = false;
+  creation_locations.on_desktop = false;
 #endif
-    creation_locations.applications_menu_location =
-        web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
-    creation_locations.in_quick_launch_bar = false;
-    web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
-                             creation_locations, current_profile, extension);
-#if defined(USE_ASH)
-  } else {
-    ChromeLauncherController::instance()->PinAppWithID(extension->id());
-#endif
-  }
+  creation_locations.applications_menu_location =
+      web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+  creation_locations.in_quick_launch_bar = false;
+  web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
+                           creation_locations, current_profile, extension);
+#else
+  ChromeLauncherController::instance()->PinAppWithID(extension->id());
+#endif  // USE_ASH

[benwells, 2016/02/16 03:45:50]

nit: be consistent with the next line (!defined(OS_MACOSX))

[scottmg, 2016/02/19 21:51:36]

Done.

 #endif  // !defined(OS_MACOSX)
 
 #if defined(OS_MACOSX)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
                  switches::kDisableHostedAppShimCreation)) {
     web_app::RevealAppShimInFinderForApp(current_profile, extension);
   }
 #endif
 
   callback_.Run(extension, web_app_info_);
@@ skipping 64 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions