Use output_all_resource_defines=false in some chrome/ grd files.
BUG=333201
Review-Url: https://codereview.chromium.org/2129413002
Cr-Commit-Position: refs/heads/master@{#406116}
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index b1035007..7e63e1d 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -252,9 +252,11 @@
namespace {
+#if defined(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) {
@@ -482,11 +484,13 @@
const char kDirectoryFilename[] = "chrome-apps.directory";
+#if defined(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.
@@ -974,6 +978,7 @@
return success;
}
+#if defined(ENABLE_APP_LIST)
bool CreateAppListDesktopShortcut(
const std::string& wm_class,
const std::string& title) {
@@ -1013,6 +1018,7 @@
return CreateShortcutInApplicationsMenu(
shortcut_filename, contents, base::FilePath(), "");
}
+#endif
void DeleteDesktopShortcuts(const base::FilePath& profile_path,
const std::string& extension_id) {
