Refactored the ShortcutLocations.hidden flag on linux

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>
 
 #if defined(USE_GLIB)
 #include <glib.h>
@@ skipping 641 matching lines @@
 
   // 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 "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.applications_menu_location =
-          web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
-    }
+    // If the shortcut contents contain NoDisplay=true, it should be hidden.
+    // Otherwise since these shortcuts are for apps, they are always in the
+    // "Chrome Apps" directory.
+    locations.applications_menu_location =
+        GetNoDisplayFromDesktopFile(shortcut_contents)
+            ? web_app::APP_MENU_LOCATION_HIDDEN
+            : web_app::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 223 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);
-    // The 'applications_menu_location' and 'hidden' locations are actually the
-    // same place ('applications').
+
     if (creation_locations.applications_menu_location !=
-            web_app::APP_MENU_LOCATION_NONE ||
-        creation_locations.hidden)
+            web_app::APP_MENU_LOCATION_NONE) {
       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.favicon, shortcut_filename);
 
   std::string app_name =
@@ skipping 14 matching lines @@
         shortcut_info.url,
         shortcut_info.extension_id,
         shortcut_info.title,
         icon_name,
         shortcut_info.profile_path,
         "",
         false);
     success = CreateShortcutOnDesktop(shortcut_filename, contents);
   }
 
-  if (creation_locations.applications_menu_location !=
-          web_app::APP_MENU_LOCATION_NONE ||
-      creation_locations.hidden) {
-    base::FilePath directory_filename;
-    std::string directory_contents;
-    switch (creation_locations.applications_menu_location) {
-      case web_app::APP_MENU_LOCATION_NONE:
-      case web_app::APP_MENU_LOCATION_ROOT:
-        break;
-      case web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS:
-        directory_filename = base::FilePath(kDirectoryFilename);
-        directory_contents = GetDirectoryFileContents(
-            ShellIntegration::GetAppShortcutsSubdirName(), "");
-        break;
-      default:
-        NOTREACHED();
-        break;
-    }
-    // Set NoDisplay=true if hidden but not in the applications menu. This will
-    // hide the application from user-facing menus.
-    std::string contents = GetDesktopFileContents(
-        chrome_exe_path,
-        app_name,
-        shortcut_info.url,
-        shortcut_info.extension_id,
-        shortcut_info.title,
-        icon_name,
-        shortcut_info.profile_path,
-        "",
-        creation_locations.applications_menu_location ==
-            web_app::APP_MENU_LOCATION_NONE);
-    success = CreateShortcutInApplicationsMenu(
-        shortcut_filename, contents, directory_filename, directory_contents) &&
-        success;
+  if (creation_locations.applications_menu_location ==
+          web_app::APP_MENU_LOCATION_NONE) {
+    return success;
   }
 
+  base::FilePath directory_filename;
+  std::string directory_contents;
+  switch (creation_locations.applications_menu_location) {
+    case web_app::APP_MENU_LOCATION_ROOT:
+    case web_app::APP_MENU_LOCATION_HIDDEN:
+      break;
+    case web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS:
+      directory_filename = base::FilePath(kDirectoryFilename);
+      directory_contents = GetDirectoryFileContents(
+          ShellIntegration::GetAppShortcutsSubdirName(), "");
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+
+  // Set NoDisplay=true if hidden. This will hide the application from
+  // user-facing menus.
+  std::string contents = GetDesktopFileContents(
+      chrome_exe_path,
+      app_name,
+      shortcut_info.url,
+      shortcut_info.extension_id,
+      shortcut_info.title,
+      icon_name,
+      shortcut_info.profile_path,
+      "",
+      creation_locations.applications_menu_location ==
+          web_app::APP_MENU_LOCATION_HIDDEN);
+  success = CreateShortcutInApplicationsMenu(
+      shortcut_filename, contents, directory_filename, directory_contents) &&
+      success;
+
   return success;
 }
 
 bool CreateAppListDesktopShortcut(
     const std::string& wm_class,
     const std::string& title) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath desktop_name(kAppListDesktopName);
   base::FilePath shortcut_filename = desktop_name.AddExtension("desktop");
@@ skipping 73 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 shell_integration_linux