Add "create Application Shortcut" to the app menu on NTP.

chrome/browser/dom_ui/app_launcher_handler.cc

 // Copyright (c) 2010 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/dom_ui/app_launcher_handler.h"
 
 #include "app/animation.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/app_launched_animation.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/rect.h"
 #include "grit/browser_resources.h"
@@ skipping 57 matching lines @@
   value->SetString("launch_url", extension->GetFullLaunchURL().spec());
   value->SetString("options_url", extension->options_url().spec());
   value->SetString("icon_big", GetIconURL(
       extension, Extension::EXTENSION_ICON_LARGE,
       "chrome://theme/IDR_APP_DEFAULT_ICON"));
   value->SetString("icon_small", GetIconURL(
       extension, Extension::EXTENSION_ICON_BITTY,
       std::string("chrome://favicon/") + extension->GetFullLaunchURL().spec()));
   value->SetInteger("launch_container", extension->launch_container());
   value->SetInteger("launch_type",
-      extension_prefs->GetLaunchType(extension->id()));
+      extension_prefs->GetLaunchType(extension->id(),
+                                     ExtensionPrefs::LAUNCH_REGULAR));
 
   int app_launch_index = extension_prefs->GetAppLaunchIndex(extension->id());
   if (app_launch_index == -1) {
     // Make sure every app has a launch index (some predate the launch index).
     app_launch_index = extension_prefs->GetNextAppLaunchIndex();
     extension_prefs->SetAppLaunchIndex(extension->id(), app_launch_index);
   }
   value->SetInteger("app_launch_index", app_launch_index);
 }
 
@@ skipping 19 matching lines @@
   dom_ui_->RegisterMessageCallback("getApps",
       NewCallback(this, &AppLauncherHandler::HandleGetApps));
   dom_ui_->RegisterMessageCallback("launchApp",
       NewCallback(this, &AppLauncherHandler::HandleLaunchApp));
   dom_ui_->RegisterMessageCallback("setLaunchType",
       NewCallback(this, &AppLauncherHandler::HandleSetLaunchType));
   dom_ui_->RegisterMessageCallback("uninstallApp",
       NewCallback(this, &AppLauncherHandler::HandleUninstallApp));
   dom_ui_->RegisterMessageCallback("hideAppsPromo",
       NewCallback(this, &AppLauncherHandler::HandleHideAppsPromo));
+  dom_ui_->RegisterMessageCallback("createAppShortcut",
+      NewCallback(this, &AppLauncherHandler::HandleCreateAppShortcut));
 }
 
 void AppLauncherHandler::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_LOADED:
     case NotificationType::EXTENSION_UNLOADED:
       if (dom_ui_->tab_contents())
         HandleGetApps(NULL);
@@ skipping 36 matching lines @@
     dictionary->SetBoolean("showPromo", false);
     promo_active_ = false;
   }
 
   bool showLauncher =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppLauncher);
   dictionary->SetBoolean("showLauncher", showLauncher);
 
 #if defined(OS_MACOSX)
   // App windows are not yet implemented on mac.
-  bool disable_app_window_launch = true;
-#else
-  bool disable_app_window_launch = false;
+  dictionary->SetBoolean("disableAppWindowLaunch", true);
+  dictionary->SetBoolean("disableCreateAppShortcut", true);
 #endif
-  dictionary->SetBoolean("disableAppWindowLaunch", disable_app_window_launch);
 }
 
 void AppLauncherHandler::HandleGetApps(const ListValue* args) {
   DictionaryValue dictionary;
   FillAppDictionary(&dictionary);
   dom_ui_->CallJavascriptFunction(L"getAppsCallback", dictionary);
 
   // First time we get here we set up the observer so that we can tell update
   // the apps as they change.
   if (registrar_.IsEmpty()) {
@@ skipping 39 matching lines @@
 
   // To give a more "launchy" experience when using the NTP launcher, we close
   // it automatically.
   Browser* browser = BrowserList::GetLastActive();
   TabContents* old_contents = NULL;
   if (browser)
     old_contents = browser->GetSelectedTabContents();
 
   AnimateAppIcon(extension, rect);
 
+  // Look at preference to find the right launch container.  If no preference
+  // is set, launch as a regular tab.
   extension_misc::LaunchContainer launch_container =
-      extension->launch_container();
-  ExtensionPrefs::LaunchType prefs_launch_type =
-      extensions_service_->extension_prefs()->GetLaunchType(extension_id);
-
-  // If the user chose to open in a window, change the container type.
-  if (prefs_launch_type == ExtensionPrefs::LAUNCH_WINDOW)
-    launch_container = extension_misc::LAUNCH_WINDOW;
+      extensions_service_->extension_prefs()->GetLaunchContainer(
+          extension, ExtensionPrefs::LAUNCH_REGULAR);
 
   TabContents* new_contents = Browser::OpenApplication(
       profile, extension, launch_container, old_contents);
 
   if (new_contents != old_contents && browser->tab_count() > 1)
     browser->CloseTabContents(old_contents);
 
   if (extension_id != extension_misc::kWebStoreAppId)
     RecordAppLaunch(promo_active_);
 }
@@ skipping 43 matching lines @@
 
   for (ExtensionIdSet::const_iterator iter = app_ids->begin();
        iter != app_ids->end(); ++iter) {
     if (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false);
   }
 
   extensions_service_->default_apps()->SetPromoHidden();
 }
 
+void AppLauncherHandler::HandleCreateAppShortcut(const ListValue* args) {
+  std::string extension_id;
+  if (!args->GetString(0, &extension_id)) {
+    NOTREACHED();
+    return;
+  }
+
+  const Extension* extension =
+      extensions_service_->GetExtensionById(extension_id, false);
+  CHECK(extension);
+
+  Browser* browser = BrowserList::GetLastActive();
+  if (!browser)
+    return;
+  browser->window()->ShowCreateChromeAppShortcutsDialog(
+      browser->profile(), extension);
+}
+
 // static
 void AppLauncherHandler::RecordWebStoreLaunch(bool promo_active) {
   if (!promo_active) return;
 
   UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
                             extension_misc::PROMO_LAUNCH_WEB_STORE,
                             extension_misc::PROMO_BUCKET_BOUNDARY);
 }
 
 // static
@@ skipping 38 matching lines @@
   // We make this check for the case of minimized windows, unit tests, etc.
   if (platform_util::IsVisible(dom_ui_->tab_contents()->GetNativeView()) &&
       Animation::ShouldRenderRichAnimation()) {
 #if defined(OS_WIN)
     AppLaunchedAnimation::Show(extension, rect);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }