[mac] Delete app shortcuts on app uninstall.

chrome/browser/extensions/app_shortcut_manager.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/extensions/app_shortcut_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 45 matching lines @@
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_));
 }
 
 AppShortcutManager::~AppShortcutManager() {}
 
 void AppShortcutManager::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
-#if !defined(OS_MACOSX)
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_INSTALLED: {
+#if !defined(OS_MACOSX)
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
       if (extension->is_platform_app() &&
           extension->location() != Manifest::COMPONENT) {
 #if defined(OS_WIN)
         if (BrowserDistribution::GetDistribution()->AppHostIsSupported() &&
             extensions::AppHostInstaller::GetInstallWithLauncher()) {
           scoped_refptr<Extension> extension_ref(const_cast<Extension*>(
               extension));
           extensions::AppHostInstaller::EnsureAppHostInstalled(
               base::Bind(&AppShortcutManager::OnAppHostInstallationComplete,
                          weak_factory_.GetWeakPtr(), extension_ref));
         } else {
           UpdateApplicationShortcuts(extension);
         }
 #else
         UpdateApplicationShortcuts(extension);
 #endif

[Avi (use Gerrit), 2013/02/05 00:19:25]

Can you label some of these? It's hard to keep track of what ends here...

[jeremya, 2013/02/05 02:38:14]

Done.

       }
+#endif

[Avi (use Gerrit), 2013/02/05 00:19:25]

...and here.

[jeremya, 2013/02/05 02:38:14]

Done.

       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
       DeleteApplicationShortcuts(extension);
       break;
     }
     default:
       NOTREACHED();
   }
-#endif
 }
 
 #if defined(OS_WIN)
 void AppShortcutManager::OnAppHostInstallationComplete(
     scoped_refptr<Extension> extension, bool app_host_install_success) {
   if (!app_host_install_success) {
     // Do not create shortcuts if App Host fails to install.
     LOG(ERROR) << "Application Runtime installation failed.";
     return;
   }
@@ skipping 66 matching lines @@
 }
 
 void AppShortcutManager::DeleteApplicationShortcuts(
     const Extension* extension) {
   ShellIntegration::ShortcutInfo delete_info =
       ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }
 
 }  // namespace extensions