Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/web_applications/web_app_mac.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_WEB_APPLICATIONS_WEB_APP_MAC_H_
 #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/shell_integration.h"

[calamity, 2014/04/14 04:23:01]

Can you remove this?

[jackhou1, 2014/04/14 05:49:19]

Done.

 #include "chrome/browser/web_applications/web_app.h"
 
 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.
 class WebAppShortcutCreator {
  public:
   // Creates a new shortcut based on information in |shortcut_info|.
   // A copy of the shortcut is placed in |app_data_dir|.
   // |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();
 
   // Returns the base name for the shortcut.
   base::FilePath GetShortcutBasename() const;
 
   // Returns a path to the Chrome Apps folder in the relevant applications
   // folder. E.g. ~/Applications or /Applications.
   virtual base::FilePath GetApplicationsDirname() const;
 
   // The full path to the app bundle under the relevant Applications folder.
   base::FilePath GetApplicationsShortcutPath() const;
 
   // The full path to the app bundle under the profile folder.
   base::FilePath GetInternalShortcutPath() const;
 
   bool CreateShortcuts(ShortcutCreationReason creation_reason,
-                       ShellIntegration::ShortcutLocations creation_locations);
+                       web_app::ShortcutLocations creation_locations);
   void DeleteShortcuts();
   bool UpdateShortcuts();
 
  protected:
   // Returns a path to an app bundle with the given id. Or an empty path if no
   // matching bundle was found.
   // Protected and virtual so it can be mocked out for testing.
   virtual base::FilePath GetAppBundleById(const std::string& bundle_id) const;
 
   // Show the bundle we just generated in the Finder.
@@ skipping 29 matching lines @@
   bool UpdatePlist(const base::FilePath& app_path) const;
 
   // Updates the icon for the shortcut.
   bool UpdateIcon(const base::FilePath& app_path) const;
 
   // Path to the data directory for this app. For example:
   // ~/Library/Application Support/Chromium/Default/Web Applications/_crx_abc/
   base::FilePath app_data_dir_;
 
   // Information about the app.
-  ShellIntegration::ShortcutInfo info_;
+  web_app::ShortcutInfo info_;
 
   DISALLOW_COPY_AND_ASSIGN(WebAppShortcutCreator);
 };
 
 }  // namespace web_app
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_