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

chrome/browser/gtk/create_application_shortcuts_dialog_gtk.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/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/environment.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_resource.h"
 #include "gfx/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // Size (in pixels) of the icon preview.
 const int kIconPreviewSizePixels = 32;
 
 // Height (in lines) of the shortcut description label.
 const int kDescriptionLabelHeightLines = 3;
 
 }  // namespace
 
 // static
-void CreateApplicationShortcutsDialogGtk::Show(GtkWindow* parent,
-                                               TabContents* tab_contents) {
-  new CreateApplicationShortcutsDialogGtk(parent, tab_contents);
+void CreateWebApplicationShortcutsDialogGtk::Show(GtkWindow* parent,
+                                                  TabContents* tab_contents) {
+  new CreateWebApplicationShortcutsDialogGtk(parent, tab_contents);
 }
 
+void CreateChromeApplicationShortcutsDialogGtk::Show(GtkWindow* parent,
+                                                     const Extension* app) {
+  new CreateChromeApplicationShortcutsDialogGtk(parent, app);
+}
+
+
 CreateApplicationShortcutsDialogGtk::CreateApplicationShortcutsDialogGtk(
-    GtkWindow* parent,
-    TabContents* tab_contents)
-    : tab_contents_(tab_contents),
-      error_dialog_(NULL) {
+    GtkWindow* parent)
+  : parent_(parent),
+    error_dialog_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Will be balanced by Release later.
   AddRef();
+}
 
-  // Get shortcut information now, it's needed for our UI.
-  web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
-
+void CreateApplicationShortcutsDialogGtk::CreateIconPixBuf(
+    const SkBitmap& bitmap) {
   // Prepare the icon. Try to scale it if it's too small, otherwise it would
   // look weird.
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&shortcut_info_.favicon);
   int pixbuf_width = gdk_pixbuf_get_width(pixbuf);
   int pixbuf_height = gdk_pixbuf_get_height(pixbuf);
   if (pixbuf_width == pixbuf_height && pixbuf_width < kIconPreviewSizePixels) {
     // Only scale the pixbuf if it's a square (for simplicity).
-    // Generally it should be square, if it's a favicon.
+    // Generally it should be square, if it's a favicon or app icon.
     // Use the highest quality interpolation. The scaling is
     // going to have low quality anyway, because the initial image
     // is likely small.
     favicon_pixbuf_ = gdk_pixbuf_scale_simple(pixbuf,
                                               kIconPreviewSizePixels,
                                               kIconPreviewSizePixels,
                                               GDK_INTERP_HYPER);
     g_object_unref(pixbuf);
   } else {
     favicon_pixbuf_ = pixbuf;
   }
+}
 
+void CreateApplicationShortcutsDialogGtk::CreateDialogBox(GtkWindow* parent) {
   // Build the dialog.
   create_dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_TITLE).c_str(),
       parent,
       (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_REJECT,
       NULL);
   gtk_widget_realize(create_dialog_);
   gtk_util::SetWindowSizeFromResources(GTK_WINDOW(create_dialog_),
@@ skipping 82 matching lines @@
   if (response == GTK_RESPONSE_ACCEPT) {
     shortcut_info_.create_on_desktop =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_));
     shortcut_info_.create_in_applications_menu =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_));
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
          NewRunnableMethod(this,
              &CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut,
              shortcut_info_));
 
-    if (tab_contents_->delegate())
-      tab_contents_->delegate()->ConvertContentsToApplication(tab_contents_);
+    OnCreatedShortcut();
   } else {
     Release();
   }
 }
 
 void CreateApplicationShortcutsDialogGtk::OnErrorDialogResponse(
     GtkWidget* widget, int response) {
   Release();
 }
 
@@ skipping 60 matching lines @@
 
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_)) ||
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_))) {
     can_accept = TRUE;
   }
 
   gtk_dialog_set_response_sensitive(GTK_DIALOG(create_dialog_),
                                     GTK_RESPONSE_ACCEPT,
                                     can_accept);
 }
+
+CreateWebApplicationShortcutsDialogGtk::CreateWebApplicationShortcutsDialogGtk(
+    GtkWindow* parent,
+    TabContents* tab_contents)
+  : CreateApplicationShortcutsDialogGtk(parent),
+    tab_contents_(tab_contents) {
+
+  // Get shortcut information now, it's needed for our UI.
+  web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
+  CreateIconPixBuf(shortcut_info_.favicon);
+
+  CreateDialogBox(parent);
+}
+
+void CreateWebApplicationShortcutsDialogGtk::OnCreatedShortcut() {
+  if (tab_contents_->delegate())
+    tab_contents_->delegate()->ConvertContentsToApplication(tab_contents_);
+}
+
+CreateChromeApplicationShortcutsDialogGtk::
+    CreateChromeApplicationShortcutsDialogGtk(
+        GtkWindow* parent,
+        const Extension* app)
+      : CreateApplicationShortcutsDialogGtk(parent),
+        app_(app),
+        ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this))  {
+
+  // Get shortcut information now, it's needed for our UI.
+  shortcut_info_.extension_id = UTF8ToUTF16(app_->id());
+  shortcut_info_.url = GURL(app_->launch_web_url());
+  shortcut_info_.title = UTF8ToUTF16(app_->name());
+  shortcut_info_.description = UTF8ToUTF16(app_->description());
+
+  // Get the icon.
+  const gfx::Size max_size(kIconPreviewSizePixels, kIconPreviewSizePixels);
+  ExtensionResource icon_resource = app_->GetIconResource(
+      kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER);
+
+  // If no icon exists that is the desired size or larger, get the
+  // largest icon available:
+  if (icon_resource.empty())
+    icon_resource = app_->GetIconResource(
+        kIconPreviewSizePixels, ExtensionIconSet::MATCH_SMALLER);
+
+  tracker_.LoadImage(app_,
+                     icon_resource,
+                     max_size,
+                     ImageLoadingTracker::DONT_CACHE);
+}
+
+// Called by tracker_ when the app's icon is loaded.
+void CreateChromeApplicationShortcutsDialogGtk::OnImageLoaded(
+    SkBitmap* image, ExtensionResource resource, int index) {
+  if (image->isNull()) {
+    NOTREACHED() << "Corrupt image in profile?";
+    return;
+  }
+  shortcut_info_.favicon = *image;
+
+  CreateIconPixBuf(*image);
+  CreateDialogBox(parent_);
+}
+
+void CreateChromeApplicationShortcutsDialogGtk::OnCreatedShortcut() {}

[Aaron Boodman, 2010/11/30 00:29:28]

Shouldn't there be something in this?

[Sam Kerner (Chrome), 2010/11/30 01:21:04]

The superclass calls OnCreatedShortcut() after a shortcut is created.  The old
URL shortcuts open the app.  The new chrome app shortcuts do not, so there is
nothing to do.

I chose to not open the app because the user is on the NTP.  If they want to
open the app, they can click on the icon.  For URL shortcuts, the only way to
open them is to find the icon that was created and click it, so opening the app
makes more sense.

I changed OnCreated() to not be pure virtual, so that the empty method is not
needed.

[Aaron Boodman, 2010/11/30 01:30:47]

Ah, I agree.

In that case, the correct style I think is to put a newline between the two
braces.