Remove HostDesktopType from some extensions files

chrome/browser/extensions/bookmark_app_helper.cc

Index: chrome/browser/extensions/bookmark_app_helper.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index 5dc5f2b04010f3aeda107030464907b74c010a88..97cddaf4d41eaea2fa56b40405c1e8bcee44d2c0 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -702,24 +702,21 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
 // 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)