Merge 230360 "[mac] Support adding the launcher to the Dock when..."

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "apps/app_shim/app_shim_mac.h"
@@ skipping 449 matching lines @@
   size_t success_count = CreateShortcutsIn(paths);
   if (success_count == 0)
     return false;
 
   if (!is_app_list)
     UpdateInternalBundleIdentifier();
 
   if (success_count != paths.size())
     return false;
 
-  if (creation_locations.in_quick_launch_bar && path_to_add_to_dock)
-    dock::AddIcon(path_to_add_to_dock, nil);
+  if (creation_locations.in_quick_launch_bar && path_to_add_to_dock) {
+    switch (dock::AddIcon(path_to_add_to_dock, nil)) {
+      case dock::IconAddFailure:
+        // If adding the icon failed, instead reveal the Finder window.
+        RevealAppShimInFinder();
+        break;
+      case dock::IconAddSuccess:
+      case dock::IconAlreadyPresent:
+        break;
+    }
+    return true;
+  }
 
   if (creation_reason == SHORTCUT_CREATION_BY_USER)
     RevealAppShimInFinder();
 
   return true;
 }
 
 void WebAppShortcutCreator::DeleteShortcuts() {
   base::FilePath app_path = GetApplicationsShortcutPath();
   if (!app_path.empty() && HasSameUserDataDir(app_path))
@@ skipping 263 matching lines @@
     ShellIntegration::ShortcutInfo shortcut_info =
         BuildShortcutInfoFromBundle(*it);
     WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info);
     shortcut_creator.DeleteShortcuts();
   }
 }
 
 }  // namespace internals
 
 }  // namespace web_app