Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
index d545ac345c858964d749fbd705e353f520d7da58..5dab1a2cbd5058c9683f060a4e80d5c1cbf29efa 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h"
 #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h"
-#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_win.h"
 #include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/common/chrome_switches.h"
@@ -44,7 +43,7 @@ namespace {
 void CreateIconAndSetRelaunchDetails(
     const base::FilePath& web_app_path,
     const base::FilePath& icon_file,
-    const ShellIntegration::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutInfo& shortcut_info,
     const HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
@@ -96,7 +95,7 @@ void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
 }
 
 void ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded(
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+    const web_app::ShortcutInfo& shortcut_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   HWND hwnd = GetNativeAppWindowHWND();