Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2436)

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 2129413002: Use output_all_resource_defines=false in some chrome/ grd files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 555b2d21010d462039d5cf75749a0b5820cdffd4..23f106b5b82e2c72a31c698976aad8f39eba374e 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -250,9 +250,11 @@ namespace shell_integration_linux {
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) {
@@ -480,11 +482,13 @@ const char kXdgOpenShebang[] = "#!/usr/bin/env xdg-open";
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.
@@ -972,6 +976,7 @@ bool CreateDesktopShortcut(
return success;
}
+#if defined(ENABLE_APP_LIST)
bool CreateAppListDesktopShortcut(
const std::string& wm_class,
const std::string& title) {
@@ -1011,6 +1016,7 @@ bool CreateAppListDesktopShortcut(
return CreateShortcutInApplicationsMenu(
shortcut_filename, contents, base::FilePath(), "");
}
+#endif
void DeleteDesktopShortcuts(const base::FilePath& profile_path,
const std::string& extension_id) {

Powered by Google App Engine
This is Rietveld 408576698