Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/web_applications/web_app_mac.h

Index: chrome/browser/web_applications/web_app_mac.h
diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h
index f47f64f98701439c9d0b2ce60beb5126b792cc34..f2296189a605fb997eecc52f6c5a18e886d98e17 100644
--- a/chrome/browser/web_applications/web_app_mac.h
+++ b/chrome/browser/web_applications/web_app_mac.h
@@ -19,10 +19,10 @@ namespace web_app {
 // Returns the full path of the .app shim that would be created by
 // web_app::CreateShortcuts().
 base::FilePath GetAppInstallPath(
-    const ShellIntegration::ShortcutInfo& shortcut_info);
+    const web_app::ShortcutInfo& shortcut_info);
 
 // If necessary, launch the shortcut for an app.
-void MaybeLaunchShortcut(const ShellIntegration::ShortcutInfo& shortcut_info);
+void MaybeLaunchShortcut(const web_app::ShortcutInfo& shortcut_info);
 
 // Creates a shortcut for a web application. The shortcut is a stub app
 // that simply loads the browser framework and runs the given app.
@@ -33,7 +33,7 @@ class WebAppShortcutCreator {
   // |chrome_bundle_id| is the CFBundleIdentifier of the Chrome browser bundle.
   WebAppShortcutCreator(
       const base::FilePath& app_data_dir,
-      const ShellIntegration::ShortcutInfo& shortcut_info);
+      const web_app::ShortcutInfo& shortcut_info);
 
   virtual ~WebAppShortcutCreator();
 
@@ -51,7 +51,7 @@ class WebAppShortcutCreator {
   base::FilePath GetInternalShortcutPath() const;
 
   bool CreateShortcuts(ShortcutCreationReason creation_reason,
-                       ShellIntegration::ShortcutLocations creation_locations);
+                       web_app::ShortcutLocations creation_locations);
   void DeleteShortcuts();
   bool UpdateShortcuts();
 
@@ -101,7 +101,7 @@ class WebAppShortcutCreator {
   base::FilePath app_data_dir_;
 
   // Information about the app.
-  ShellIntegration::ShortcutInfo info_;
+  web_app::ShortcutInfo info_;
 
   DISALLOW_COPY_AND_ASSIGN(WebAppShortcutCreator);
 };