Polish UI of bookmark app creation.

chrome/browser/extensions/bookmark_app_helper.cc

 // Copyright 2014 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/bookmark_app_helper.h"
 
 #include <cctype>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/favicon_downloader.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/pref_names.h"
@@ skipping 379 matching lines @@
     return;
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(contents_);
   if (!browser) {
     // The browser can be null in tests.
     callback_.Run(extension, web_app_info_);
     return;
   }
 
-  // Pin the app to the shelf on Ash.
+  // Pin the app to the shelf on Ash, or the taskbar / dock on Windows /
+  // Mac.

[sashab, 2015/02/06 15:35:44]

nit: "Pin the app to the shelf/taskbar/dock on Ash/Windows/Mac". Or even just
"Pin the app to its relevant launcher depending on the OS."

[benwells, 2015/02/06 15:52:17]

Done.

+  Profile* current_profile = profile_->GetOriginalProfile();
   chrome::HostDesktopType desktop = browser->host_desktop_type();
+  if (desktop != chrome::HOST_DESKTOP_TYPE_ASH) {
+    web_app::ShortcutLocations creation_locations;
+#if defined(OS_LINUX)
+    creation_locations.on_desktop = true;
+#else
+    creation_locations.on_desktop = false;
+#endif
+    creation_locations.applications_menu_location =
+        web_app::APP_MENU_LOCATION_HIDDEN;
+    creation_locations.in_quick_launch_bar = true;
+    web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
+                             creation_locations, current_profile, extension);
 #if defined(USE_ASH)
-  if (desktop == chrome::HOST_DESKTOP_TYPE_ASH)
+  } else {
     ChromeLauncherController::instance()->PinAppWithID(extension->id());
 #endif
+  }
 
   // Show the newly installed app in the app launcher, in finder (on Mac) or
   // chrome://apps.
-  Profile* current_profile = profile_->GetOriginalProfile();
   if (IsAppLauncherEnabled()) {
     AppListService::Get(desktop)
         ->ShowForAppInstall(current_profile, extension->id(), false);
 #if defined(OS_MACOSX)
   } else if (base::CommandLine::ForCurrentProcess()->HasSwitch(
                  switches::kEnableHostedAppShimCreation)) {
     web_app::RevealAppShimInFinderForApp(profile_, extension);
 #endif
   } else {
     chrome::NavigateParams params(current_profile,
@@ skipping 81 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidWebExtentSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions