Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/views/create_application_shortcut_view.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_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
   Profile* profile_;
 
   // UI elements on the dialog.
   views::View* app_info_;
   views::Label* create_shortcuts_label_;
   views::Checkbox* desktop_check_box_;
   views::Checkbox* menu_check_box_;
   views::Checkbox* quick_launch_check_box_;
 
   // Target shortcut info.
-  ShellIntegration::ShortcutInfo shortcut_info_;
+  web_app::ShortcutInfo shortcut_info_;
   // If false, the shortcut will be created in the root level of the Start Menu.
   bool create_in_chrome_apps_subdir_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateApplicationShortcutView);
 };
 
 // Create an application shortcut pointing to a URL.
 class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView {
  public:
   explicit CreateUrlApplicationShortcutView(content::WebContents* web_contents);
@@ skipping 36 matching lines @@
   CreateChromeApplicationShortcutView(
       Profile* profile,
       const extensions::Extension* app,
       const base::Closure& close_callback);
   virtual ~CreateChromeApplicationShortcutView();
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
  private:
   void OnShortcutInfoLoaded(
-      const ShellIntegration::ShortcutInfo& shortcut_info);
+      const web_app::ShortcutInfo& shortcut_info);
 
   const extensions::Extension* app_;
   base::Closure close_callback_;
 
   base::WeakPtrFactory<CreateChromeApplicationShortcutView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateChromeApplicationShortcutView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_