Move enable_app_list to a buildflag.

chrome/browser/shell_integration_linux.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/shell_integration_linux.h"
 
 #include <fcntl.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 29 matching lines @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/features.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_family.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace shell_integration {
@@ skipping 200 matching lines @@
 DefaultWebClientState IsDefaultProtocolClient(const std::string& protocol) {
   return GetIsDefaultWebClient(protocol);
 }
 
 }  // namespace shell_integration
 
 namespace shell_integration_linux {
 
 namespace {
 
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
 // The Categories for the App Launcher desktop shortcut. Should be the same as
 // the Chrome desktop shortcut, so they are in the same sub-menu.
 const char kAppListCategories[] = "Network;WebBrowser;";
 #endif
 
 std::string CreateShortcutIcon(const gfx::ImageFamily& icon_images,
                                const base::FilePath& shortcut_filename) {
   if (icon_images.empty())
     return std::string();
 
@@ skipping 211 matching lines @@
   return quoted_path;
 }
 
 const char kDesktopEntry[] = "Desktop Entry";
 
 const char kXdgOpenShebang[] = "#!/usr/bin/env xdg-open";
 #endif
 
 const char kDirectoryFilename[] = "chrome-apps.directory";
 
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
 #if defined(GOOGLE_CHROME_BUILD)
 const char kAppListDesktopName[] = "chrome-app-list";
 #else  // CHROMIUM_BUILD
 const char kAppListDesktopName[] = "chromium-app-list";
 #endif
 #endif
 
 // Get the value of NoDisplay from the [Desktop Entry] section of a .desktop
 // file, given in |shortcut_contents|. If the key is not found, returns false.
 bool GetNoDisplayFromDesktopFile(const std::string& shortcut_contents) {
@@ skipping 508 matching lines @@
       "",
       creation_locations.applications_menu_location ==
           web_app::APP_MENU_LOCATION_HIDDEN);
   success = CreateShortcutInApplicationsMenu(
       shortcut_filename, contents, directory_filename, directory_contents) &&
       success;
 
   return success;
 }
 
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
 bool CreateAppListDesktopShortcut(
     const std::string& wm_class,
     const std::string& title) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   base::FilePath desktop_name(kAppListDesktopName);
   base::FilePath shortcut_filename = desktop_name.AddExtension("desktop");
 
   // We do not want duplicate shortcuts. Delete any that already exist and
   // replace them.
@@ skipping 64 matching lines @@
   base::FilePath applications_menu = GetDataWriteLocation(env.get());
   applications_menu = applications_menu.AppendASCII("applications");
   std::vector<base::FilePath> shortcut_filenames_app_menu =
       GetExistingProfileShortcutFilenames(profile_path, applications_menu);
   for (const auto& menu : shortcut_filenames_app_menu) {
     DeleteShortcutInApplicationsMenu(menu, base::FilePath(kDirectoryFilename));
   }
 }
 
 }  // namespace shell_integration_linux