Ensure ephemeral apps have dock icons on mac

chrome/browser/apps/shortcut_manager.cc

 // Copyright 2013 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/apps/shortcut_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_util.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/one_shot_event.h"
 
 using extensions::Extension;
 
 namespace {
 
 // This version number is stored in local prefs to check whether app shortcuts
 // need to be recreated. This might happen when we change various aspects of app
 // shortcuts like command-line flags or associated icons, binaries, etc.
 const int kCurrentAppShortcutsVersion = 0;
 
 // Delay in seconds before running UpdateShortcutsForAllApps.
 const int kUpdateShortcutsForAllAppsDelay = 10;
 
-// Creates a shortcut for an application in the applications menu, if there is
-// not already one present.
-void CreateShortcutsInApplicationsMenu(Profile* profile,
-                                       const Extension* app) {
+void CreateShortcutsForApp(Profile* profile, const Extension* app) {
   web_app::ShortcutLocations creation_locations;
-  // Create the shortcut in the Chrome Apps subdir.
-  creation_locations.applications_menu_location =
-      web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+
+  if (extensions::util::IsEphemeralApp(app->id(), profile)) {
+    // Ephemeral apps should not have visible shortcuts, but may still require
+    // platform-specific handling.
+    creation_locations.hidden = true;

[benwells, 2014/06/05 09:27:43]

I think this will have some effect on Linux; it might cause the app to show up
in the unity launcher search. I'm not sure about Windows.

Have you tested on those OSs?

[tmdiep, 2014/06/06 02:49:55]

I thought the purpose of adding NoDisplay=true in the .desktop files was to hide
it from unity search, and so used the hidden flag. However, it does show up in
unity search.

I found that adding Hidden=true in .desktop does hide it from search:
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest...

ChromeOS was fine. I forgot about Windows. Fixed now.

[Matt Giuca, 2014/06/06 05:50:17]

Yeah, NoDisplay=true is what you want if you want to hide an app from Unity
search / other menus (but still associate it with apps for icon and title
purposes).

I'm not sure why it is showing up in Unity search, except that Unity is pretty
buggy and not very good at realising things have changed. If you had a shortcut
without NoDisplay=true, you may have to log out and back in again (restart
Unity) to see the effect of adding NoDisplay=true.

Are you sure that setting creation_locations.hidden = true actually causes
NoDisplay=true? From my reading of
shell_integration_linux::CreateDesktopShortcut, it triggers if
applications_menu_location is APP_MENU_LOCATION_NONE, not if
creation_locations.hidden is true.

Hidden=true isn't what you want, because that is equivalent to deleting the file
(which means it won't have an icon associated with it).

+  } else {
+    // Creates a shortcut for an app in the Chrome Apps subdir of the
+    // applications menu, if there is not already one present.
+    creation_locations.applications_menu_location =
+        web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+  }
+
   web_app::CreateShortcuts(
       web_app::SHORTCUT_CREATION_AUTOMATED, creation_locations, profile, app);
 }
 
 void SetCurrentAppShortcutsVersion(PrefService* prefs) {
   prefs->SetInteger(prefs::kAppShortcutsVersion, kCurrentAppShortcutsVersion);
 }
 
 }  // namespace
 
@@ skipping 53 matching lines @@
   if (!extension->is_app())
     return;
 
   // If the app is being updated, update any existing shortcuts but do not
   // create new ones. If it is being installed, automatically create a
   // shortcut in the applications menu (e.g., Start Menu).
   if (is_update && !from_ephemeral) {
     web_app::UpdateAllShortcuts(
         base::UTF8ToUTF16(old_name), profile_, extension);
   } else {
-    CreateShortcutsInApplicationsMenu(profile_, extension);
+    CreateShortcutsForApp(profile_, extension);
   }
 }
 
 void AppShortcutManager::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const Extension* extension) {
   web_app::DeleteAllShortcuts(profile_, extension);
 }
 
 void AppShortcutManager::OnProfileWillBeRemoved(
@@ skipping 12 matching lines @@
     return;
 
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&web_app::UpdateShortcutsForAllApps,
                  profile_,
                  base::Bind(&SetCurrentAppShortcutsVersion, prefs_)),
       base::TimeDelta::FromSeconds(kUpdateShortcutsForAllAppsDelay));
 }