Remove HostDesktopType from c/b/ui/bookmarks

chrome/browser/ui/bookmarks/bookmark_utils.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/bookmarks/bookmark_utils.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 122 matching lines @@
   // Because this gets re-parsed by FixupURL(), it's safe to omit the scheme
   // and trailing slash, and unescape most characters.  However, it's
   // important not to drop any username/password, or unescape anything that
   // changes the URL's meaning.
   return url_formatter::FormatUrl(
       url, languages, url_formatter::kFormatUrlOmitAll &
                           ~url_formatter::kFormatUrlOmitUsernamePassword,
       net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
 }
 
-bool IsAppsShortcutEnabled(Profile* profile,
-                           chrome::HostDesktopType host_desktop_type) {
+bool IsAppsShortcutEnabled(Profile* profile) {
   // Legacy supervised users can not have apps installed currently so there's no
   // need to show the apps shortcut.
   if (profile->IsLegacySupervised())
     return false;
 
+#if defined(USE_ASH)
   // Don't show the apps shortcut in ash since the app launcher is enabled.
-  if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
-    return false;
+  return false;
+#endif

[sky, 2016/02/16 02:58:04]

Similar comment about #else.

[scottmg, 2016/02/17 03:12:33]

Done.

 
   return search::IsInstantExtendedAPIEnabled() && !profile->IsOffTheRecord();
 }
 
-bool ShouldShowAppsShortcutInBookmarkBar(
-  Profile* profile,
-  chrome::HostDesktopType host_desktop_type) {
-  return IsAppsShortcutEnabled(profile, host_desktop_type) &&
+bool ShouldShowAppsShortcutInBookmarkBar(Profile* profile) {
+  return IsAppsShortcutEnabled(profile) &&
          profile->GetPrefs()->GetBoolean(
              bookmarks::prefs::kShowAppsShortcutInBookmarkBar);
 }
 
 bool ShouldRemoveBookmarkThisPageUI(Profile* profile) {
   return GetBookmarkShortcutDisposition(profile) ==
          BOOKMARK_SHORTCUT_DISPOSITION_REMOVED;
 }
 
 bool ShouldRemoveBookmarkOpenPagesUI(Profile* profile) {
@@ skipping 148 matching lines @@
     return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_BOOKMARK_BAR_FOLDER_MANAGED);
   }
 #endif
 
   return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color);
 }
 #endif
 
 }  // namespace chrome