Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "apps/app_shim/app_shim_mac.h"
@@ skipping 185 matching lines @@
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   DCHECK(!user_data_dir.empty());
   return StartsWithASCII(
       base::SysNSStringToUTF8(
           [plist valueForKey:app_mode::kCrAppModeUserDataDirKey]),
       user_data_dir.value(),
       true /* case_sensitive */);
 }
 
 void LaunchShimOnFileThread(
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+    const web_app::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   base::FilePath shim_path = web_app::GetAppInstallPath(shortcut_info);
 
   if (shim_path.empty() ||
       !base::PathExists(shim_path) ||
       !HasSameUserDataDir(shim_path)) {
     // The user may have deleted the copy in the Applications folder, use the
     // one in the web app's |app_data_dir_|.
     base::FilePath app_data_dir = web_app::GetWebAppDataDirectory(
         shortcut_info.profile_path, shortcut_info.extension_id, GURL());
@@ skipping 164 matching lines @@
                                   base::FileEnumerator::DIRECTORIES);
   for (base::FilePath bundle_path = enumerator.Next();
        !bundle_path.empty(); bundle_path = enumerator.Next()) {
     if (IsShimForProfile(bundle_path.BaseName(), profile_base_name))
       bundle_paths.push_back(bundle_path);
   }
 
   return bundle_paths;
 }
 
-ShellIntegration::ShortcutInfo BuildShortcutInfoFromBundle(
+web_app::ShortcutInfo BuildShortcutInfoFromBundle(
     const base::FilePath& bundle_path) {
   NSDictionary* plist = ReadPlist(GetPlistPath(bundle_path));
 
-  ShellIntegration::ShortcutInfo shortcut_info;
+  web_app::ShortcutInfo shortcut_info;
   shortcut_info.extension_id = base::SysNSStringToUTF8(
       [plist valueForKey:app_mode::kCrAppModeShortcutIDKey]);
   shortcut_info.is_platform_app = true;
   shortcut_info.url = GURL(base::SysNSStringToUTF8(
       [plist valueForKey:app_mode::kCrAppModeShortcutURLKey]));
   shortcut_info.title = base::SysNSStringToUTF16(
       [plist valueForKey:app_mode::kCrAppModeShortcutNameKey]);
   shortcut_info.profile_name = base::SysNSStringToUTF8(
       [plist valueForKey:app_mode::kCrAppModeProfileNameKey]);
 
@@ skipping 15 matching lines @@
 
 namespace chrome {
 
 void ShowCreateChromeAppShortcutsDialog(gfx::NativeWindow /*parent_window*/,
                                         Profile* profile,
                                         const extensions::Extension* app,
                                         const base::Closure& close_callback) {
   // Normally we would show a dialog, but since we always create the app
   // shortcut in ~/Applications there are no options for the user to choose.
   web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
-                           ShellIntegration::ShortcutLocations(),
+                           web_app::ShortcutLocations(),
                            profile,
                            app);
   if (!close_callback.is_null())
     close_callback.Run();
 }
 
 }  // namespace chrome
 
 namespace web_app {
 
 WebAppShortcutCreator::WebAppShortcutCreator(
     const base::FilePath& app_data_dir,
-    const ShellIntegration::ShortcutInfo& shortcut_info)
+    const web_app::ShortcutInfo& shortcut_info)
     : app_data_dir_(app_data_dir),
       info_(shortcut_info) {}
 
 WebAppShortcutCreator::~WebAppShortcutCreator() {}
 
 base::FilePath WebAppShortcutCreator::GetApplicationsShortcutPath() const {
   base::FilePath applications_dir = GetApplicationsDirname();
   return applications_dir.empty() ?
       base::FilePath() : applications_dir.Append(GetShortcutBasename());
 }
@@ skipping 59 matching lines @@
 
     base::mac::RemoveQuarantineAttribute(dst_path.Append(app_name));
     ++succeeded;
   }
 
   return succeeded;
 }
 
 bool WebAppShortcutCreator::CreateShortcuts(
     ShortcutCreationReason creation_reason,
-    ShellIntegration::ShortcutLocations creation_locations) {
+    web_app::ShortcutLocations creation_locations) {
   const base::FilePath applications_dir = GetApplicationsDirname();
   if (applications_dir.empty() ||
       !base::DirectoryExists(applications_dir.DirName())) {
     LOG(ERROR) << "Couldn't find an Applications directory to copy app to.";
     return false;
   }
 
   UpdateAppShortcutsSubdirLocalizedName(applications_dir);
 
   // If non-nil, this path is added to the OSX Dock after creating shortcuts.
@@ skipping 252 matching lines @@
   base::FilePath app_path = GetApplicationsShortcutPath();
   if (app_path.empty())
     return;
 
   [[NSWorkspace sharedWorkspace]
                     selectFile:base::mac::FilePathToNSString(app_path)
       inFileViewerRootedAtPath:nil];
 }
 
 base::FilePath GetAppInstallPath(
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+    const web_app::ShortcutInfo& shortcut_info) {
   WebAppShortcutCreator shortcut_creator(base::FilePath(), shortcut_info);
   return shortcut_creator.GetApplicationsShortcutPath();
 }
 
-void MaybeLaunchShortcut(const ShellIntegration::ShortcutInfo& shortcut_info) {
+void MaybeLaunchShortcut(const web_app::ShortcutInfo& shortcut_info) {
   if (!apps::IsAppShimsEnabled())
     return;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&LaunchShimOnFileThread, shortcut_info));
 }
 
 namespace internals {
 
 bool CreatePlatformShortcuts(
     const base::FilePath& app_data_path,
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations,
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations,
     ShortcutCreationReason creation_reason) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   WebAppShortcutCreator shortcut_creator(app_data_path, shortcut_info);
   return shortcut_creator.CreateShortcuts(creation_reason, creation_locations);
 }
 
 void DeletePlatformShortcuts(
     const base::FilePath& app_data_path,
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+    const web_app::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   WebAppShortcutCreator shortcut_creator(app_data_path, shortcut_info);
   shortcut_creator.DeleteShortcuts();
 }
 
 void UpdatePlatformShortcuts(
     const base::FilePath& app_data_path,
     const base::string16& old_app_title,
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+    const web_app::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   WebAppShortcutCreator shortcut_creator(app_data_path, shortcut_info);
   shortcut_creator.UpdateShortcuts();
 }
 
 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path) {
   const std::string profile_base_name = profile_path.BaseName().value();
   std::vector<base::FilePath> bundles = GetAllAppBundlesInPath(
       profile_path.Append(chrome::kWebAppDirname), profile_base_name);
 
   for (std::vector<base::FilePath>::const_iterator it = bundles.begin();
        it != bundles.end(); ++it) {
-    ShellIntegration::ShortcutInfo shortcut_info =
+    web_app::ShortcutInfo shortcut_info =
         BuildShortcutInfoFromBundle(*it);
     WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info);
     shortcut_creator.DeleteShortcuts();
   }
 }
 
 }  // namespace internals
 
 }  // namespace web_app