Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h

Index: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
index c23c84c0d12160dc56093a82af4dee3018183349..7fc02170627c4588cd2d15222d083a6f4886dc07 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
@@ -9,7 +9,7 @@
 #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"
@@ -58,8 +58,8 @@ class CreateApplicationShortcutsDialogGtk
   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_;
@@ -69,7 +69,7 @@ class CreateApplicationShortcutsDialogGtk
   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_;
 
@@ -123,12 +123,12 @@ class CreateChromeApplicationShortcutsDialogGtk
   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_;