Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

Index: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index 0af72808d8e6c63bd7ed8e2ef854e520d2ac1db6..bc3c97631aa93ae1eb891db6e640feec95a938bc 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -10,7 +10,6 @@
 #include "base/environment.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/shell_integration.h"
 #include "chrome/browser/shell_integration_linux.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -18,7 +17,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
-#include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -208,14 +206,14 @@ void CreateApplicationShortcutsDialogGtk::OnCreateDialogResponse(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (response == GTK_RESPONSE_ACCEPT) {
-    ShellIntegration::ShortcutLocations creation_locations;
+    web_app::ShortcutLocations creation_locations;
     creation_locations.on_desktop =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_));
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_))) {
       creation_locations.applications_menu_location =
           create_in_chrome_apps_subdir_ ?
-              ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :
-              ShellIntegration::APP_MENU_LOCATION_ROOT;
+              web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :
+              web_app::APP_MENU_LOCATION_ROOT;
     }
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut,
@@ -233,8 +231,8 @@ void CreateApplicationShortcutsDialogGtk::OnErrorDialogResponse(
 }
 
 void CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut(
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations) {
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   ShellIntegrationLinux::CreateDesktopShortcut(shortcut_info,
                                                creation_locations);
@@ -344,7 +342,7 @@ CreateChromeApplicationShortcutsDialogGtk::
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutsDialogGtk::OnShortcutInfoLoaded(
-  const ShellIntegration::ShortcutInfo& shortcut_info) {
+  const web_app::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CreateIconPixBuf(shortcut_info_.favicon);
@@ -352,8 +350,8 @@ void CreateChromeApplicationShortcutsDialogGtk::OnShortcutInfoLoaded(
 }
 
 void CreateChromeApplicationShortcutsDialogGtk::CreateDesktopShortcut(
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations) {
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (web_app::internals::CreateShortcutsOnFileThread(