Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_CREATE_APPLICATION_SHORTCUTS_DIALOG_GTK_H_
 #define CHROME_BROWSER_UI_GTK_CREATE_APPLICATION_SHORTCUTS_DIALOG_GTK_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 
@@ skipping 28 matching lines @@
                        OnToggleCheckbox);
 
   virtual void CreateDialogBox(GtkWindow* parent);
   virtual void CreateIconPixBuf(const gfx::ImageFamily& image);
 
   // This method is called after a shortcut is created.
   // Subclasses can override it to take some action at that time.
   virtual void OnCreatedShortcut(void) {}
 
   virtual void CreateDesktopShortcut(
-      const ShellIntegration::ShortcutInfo& shortcut_info,
-      const ShellIntegration::ShortcutLocations& creation_locations);
+      const web_app::ShortcutInfo& shortcut_info,
+      const web_app::ShortcutLocations& creation_locations);
   virtual void ShowErrorDialog();
 
   GtkWindow* parent_;
 
   // UI elements.
   GtkWidget* desktop_checkbox_;
   GtkWidget* menu_checkbox_;
 
   // ShortcutInfo for the new shortcut.
-  ShellIntegration::ShortcutInfo shortcut_info_;
+  web_app::ShortcutInfo shortcut_info_;
   // If false the shortcut will be created in the top-level menu.
   bool create_in_chrome_apps_subdir_;
 
   // Image associated with the site or app, scaled to the appropriate size to
   // display in the dialog box.
   GdkPixbuf* favicon_pixbuf_;
 
   // Dialog box that allows the user to create an application shortcut.
   GtkWidget* create_dialog_;
 
@@ skipping 33 matching lines @@
   CreateChromeApplicationShortcutsDialogGtk(
       GtkWindow* parent,
       Profile* profile,
       const extensions::Extension* app,
       const base::Closure& close_callback);
 
  protected:
   virtual ~CreateChromeApplicationShortcutsDialogGtk();
 
   virtual void CreateDesktopShortcut(
-      const ShellIntegration::ShortcutInfo& shortcut_info,
-      const ShellIntegration::ShortcutLocations& creation_locations) OVERRIDE;
+      const web_app::ShortcutInfo& shortcut_info,
+      const web_app::ShortcutLocations& creation_locations) OVERRIDE;
 
  private:
   void OnShortcutInfoLoaded(
-      const ShellIntegration::ShortcutInfo& shortcut_info);
+      const web_app::ShortcutInfo& shortcut_info);
 
   const extensions::Extension* app_;
   base::FilePath profile_path_;
   base::Closure close_callback_;
   DISALLOW_COPY_AND_ASSIGN(CreateChromeApplicationShortcutsDialogGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CREATE_APPLICATION_SHORTCUTS_DIALOG_GTK_H_