Moved IS_EPHEMERAL flag to extension prefs

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/chrome_notification_types.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/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 14 matching lines @@
 void CreateShortcutsInApplicationsMenu(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;
   web_app::CreateShortcuts(
       web_app::SHORTCUT_CREATION_AUTOMATED, creation_locations, profile, app);
 }
 
-bool ShouldCreateShortcutFor(const Extension* extension) {
+bool ShouldCreateShortcutFor(Profile* profile, const Extension* extension) {
   return extension->is_platform_app() &&
       extension->location() != extensions::Manifest::COMPONENT &&
-      extension->ShouldDisplayInAppLauncher();
+      extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile);
 }
 
 }  // namespace
 
 // static
 void AppShortcutManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   // Indicates whether app shortcuts have been created.
   registry->RegisterBooleanPref(
       prefs::kAppShortcutsHaveBeenCreated, false,
@@ skipping 52 matching lines @@
       const extensions::InstalledExtensionInfo* installed_info =
           content::Details<const extensions::InstalledExtensionInfo>(details)
               .ptr();
       const Extension* extension = installed_info->extension;
       // 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 (installed_info->is_update) {
         web_app::UpdateAllShortcuts(
             base::UTF8ToUTF16(installed_info->old_name), profile_, extension);
-      } else if (ShouldCreateShortcutFor(extension)) {
+      } else if (ShouldCreateShortcutFor(profile_, extension)) {
         CreateShortcutsInApplicationsMenu(profile_, extension);
       }
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
       web_app::DeleteAllShortcuts(profile_, extension);
       break;
     }
@@ skipping 34 matching lines @@
   extensions::ExtensionSystem* extension_system;
   ExtensionServiceInterface* extension_service;
   if (!(extension_system = extensions::ExtensionSystem::Get(profile_)) ||
       !(extension_service = extension_system->extension_service()))
     return;
 
   // Create an applications menu shortcut for each app in this profile.
   const extensions::ExtensionSet* apps = extension_service->extensions();
   for (extensions::ExtensionSet::const_iterator it = apps->begin();
        it != apps->end(); ++it) {
-    if (ShouldCreateShortcutFor(it->get()))
+    if (ShouldCreateShortcutFor(profile_, it->get()))
       CreateShortcutsInApplicationsMenu(profile_, it->get());
   }
 }