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

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, address comment, more whitelist.cc cleanup 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
« no previous file with comments | « chrome/browser/shell_integration_linux.h ('k') | chrome/common/common_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index b10350070c9f307dad0a4ad62195b202926b0ec2..7e63e1dd943f06c7071f0bbffa990b6a4699728b 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -252,9 +252,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) {
@@ -482,11 +484,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.
@@ -974,6 +978,7 @@ bool CreateDesktopShortcut(
return success;
}
+#if defined(ENABLE_APP_LIST)
bool CreateAppListDesktopShortcut(
const std::string& wm_class,
const std::string& title) {
@@ -1013,6 +1018,7 @@ bool CreateAppListDesktopShortcut(
return CreateShortcutInApplicationsMenu(
shortcut_filename, contents, base::FilePath(), "");
}
+#endif
void DeleteDesktopShortcuts(const base::FilePath& profile_path,
const std::string& extension_id) {
« no previous file with comments | « chrome/browser/shell_integration_linux.h ('k') | chrome/common/common_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698