Move app launcher and chrome apps shortcut strings into the installer

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 <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 570 matching lines @@
 }
 
 ShellIntegration::ShortcutLocations GetExistingShortcutLocations(
     base::Environment* env,
     const base::FilePath& profile_path,
     const std::string& extension_id) {
   base::FilePath desktop_path;
   // If Get returns false, just leave desktop_path empty.
   PathService::Get(base::DIR_USER_DESKTOP, &desktop_path);
   return GetExistingShortcutLocations(env, profile_path, extension_id,
-                                             desktop_path);
+                                      desktop_path);
 }
 
 ShellIntegration::ShortcutLocations GetExistingShortcutLocations(
     base::Environment* env,
     const base::FilePath& profile_path,
     const std::string& extension_id,
     const base::FilePath& desktop_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath shortcut_filename = GetExtensionShortcutFilename(
       profile_path, extension_id);
   DCHECK(!shortcut_filename.empty());
   ShellIntegration::ShortcutLocations locations;
 
   // Determine whether there is a shortcut on desktop.
   if (!desktop_path.empty()) {
     locations.on_desktop =
         base::PathExists(desktop_path.Append(shortcut_filename));
   }
 
   // Determine whether there is a shortcut in the applications directory.
   std::string shortcut_contents;
   if (GetExistingShortcutContents(env, shortcut_filename, &shortcut_contents)) {
-    // Whether this counts as "hidden" or "in_applications_menu" depends on
-    // whether it contains NoDisplay=true.
-    if (GetNoDisplayFromDesktopFile(shortcut_contents))
+    // Whether this counts as "hidden" or "APP_MENU_LOCATION_SUBDIR_CHROMEAPPS"
+    // depends on whether it contains NoDisplay=true. Since these shortcuts are
+    // for apps, they are always in the "Chrome Apps" directory.
+    if (GetNoDisplayFromDesktopFile(shortcut_contents)) {
       locations.hidden = true;
-    else
-      locations.in_applications_menu = true;
+    } else {
+      locations.applications_menu_location =
+          ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+    }
   }
 
   return locations;
 }
 
 bool GetExistingShortcutContents(base::Environment* env,
                                  const base::FilePath& desktop_filename,
                                  std::string* output) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
@@ skipping 206 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath shortcut_filename;
   if (!shortcut_info.extension_id.empty()) {
     shortcut_filename = GetExtensionShortcutFilename(
         shortcut_info.profile_path, shortcut_info.extension_id);
     // For extensions we do not want duplicate shortcuts. So, delete any that
     // already exist and replace them.
     if (creation_locations.on_desktop)
       DeleteShortcutOnDesktop(shortcut_filename);
-    if (creation_locations.in_applications_menu || creation_locations.hidden)
+    // The 'applications_menu_location' and 'hidden' locations are actually the
+    // same place ('applications').
+    if (creation_locations.applications_menu_location !=
+            ShellIntegration::APP_MENU_LOCATION_NONE ||
+        creation_locations.hidden)
       DeleteShortcutInApplicationsMenu(shortcut_filename, base::FilePath());
   } else {
     shortcut_filename = GetWebShortcutFilename(shortcut_info.url);
   }
   if (shortcut_filename.empty())
     return false;
 
   std::string icon_name = CreateShortcutIcon(shortcut_info, shortcut_filename);
 
   std::string app_name =
@@ skipping 14 matching lines @@
         shortcut_info.url,
         shortcut_info.extension_id,
         shortcut_info.extension_path,
         shortcut_info.title,
         icon_name,
         shortcut_info.profile_path,
         false);
     success = CreateShortcutOnDesktop(shortcut_filename, contents);
   }
 
-  // The 'in_applications_menu' and 'hidden' locations are actually the same
-  // place ('applications').
-  if (creation_locations.in_applications_menu || creation_locations.hidden) {
+  if (creation_locations.applications_menu_location !=
+          ShellIntegration::APP_MENU_LOCATION_NONE ||
+      creation_locations.hidden) {
     base::FilePath directory_filename;
     std::string directory_contents;
-    if (!creation_locations.applications_menu_subdir.empty()) {
+    if (creation_locations.applications_menu_location ==
+            ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS) {
       directory_filename = base::FilePath(kDirectoryFilename);
       directory_contents = ShellIntegrationLinux::GetDirectoryFileContents(
-          creation_locations.applications_menu_subdir, "");
+          ShellIntegration::GetAppShortcutsSubdirName(), "");
     }
-    // Set NoDisplay=true if hidden but not in_applications_menu. This will hide
-    // the application from user-facing menus.
+    // Set NoDisplay=true if hidden but not in the applications menu. This will
+    // hide the application from user-facing menus.
     std::string contents = ShellIntegrationLinux::GetDesktopFileContents(
         chrome_exe_path,
         app_name,
         shortcut_info.url,
         shortcut_info.extension_id,
         shortcut_info.extension_path,
         shortcut_info.title,
         icon_name,
         shortcut_info.profile_path,
-        !creation_locations.in_applications_menu);
+        creation_locations.applications_menu_location ==
+            ShellIntegration::APP_MENU_LOCATION_NONE);
     success = CreateShortcutInApplicationsMenu(
         shortcut_filename, contents, directory_filename, directory_contents) &&
         success;
   }
 
   return success;
 }
 
 void DeleteDesktopShortcuts(const base::FilePath& profile_path,
                             const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath shortcut_filename = GetExtensionShortcutFilename(
       profile_path, extension_id);
   DCHECK(!shortcut_filename.empty());
 
   DeleteShortcutOnDesktop(shortcut_filename);
   // Delete shortcuts from |kDirectoryFilename|.
   // Note that it is possible that shortcuts were not created in the Chrome Apps
-  // directory (depending on the value of |applications_menu_subdir| when they
-  // were created). It doesn't matter: this will still delete the shortcut even
-  // if it isn't in the directory.
+  // directory. It doesn't matter: this will still delete the shortcut even if
+  // it isn't in the directory.
   DeleteShortcutInApplicationsMenu(shortcut_filename,
                                    base::FilePath(kDirectoryFilename));
 }
 
 void DeleteAllDesktopShortcuts(const base::FilePath& profile_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   // Delete shortcuts from Desktop.
@@ skipping 17 matching lines @@
     for (std::vector<base::FilePath>::const_iterator it =
          shortcut_filenames_app_menu.begin();
          it != shortcut_filenames_app_menu.end(); ++it) {
       DeleteShortcutInApplicationsMenu(*it,
                                        base::FilePath(kDirectoryFilename));
     }
   }
 }
 
 }  // namespace ShellIntegrationLinux