Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/shell_integration.h"
 #include "chrome/browser/shell_integration_linux.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
-#include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
@@ skipping 169 matching lines @@
     gtk_widget_destroy(error_dialog_);
 
   g_object_unref(favicon_pixbuf_);
 }
 
 void CreateApplicationShortcutsDialogGtk::OnCreateDialogResponse(
     GtkWidget* widget, int response) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (response == GTK_RESPONSE_ACCEPT) {
-    ShellIntegration::ShortcutLocations creation_locations;
+    web_app::ShortcutLocations creation_locations;
     creation_locations.on_desktop =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_));
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_))) {
       creation_locations.applications_menu_location =
           create_in_chrome_apps_subdir_ ?
-              ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :
-              ShellIntegration::APP_MENU_LOCATION_ROOT;
+              web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :
+              web_app::APP_MENU_LOCATION_ROOT;
     }
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut,
                    this, shortcut_info_, creation_locations));
 
     OnCreatedShortcut();
   } else {
     Release();
   }
 }
 
 void CreateApplicationShortcutsDialogGtk::OnErrorDialogResponse(
     GtkWidget* widget, int response) {
   Release();
 }
 
 void CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut(
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations) {
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   ShellIntegrationLinux::CreateDesktopShortcut(shortcut_info,
                                                creation_locations);
   Release();
 }
 
 void CreateApplicationShortcutsDialogGtk::ShowErrorDialog() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Hide the create dialog so that the user can no longer interact with it.
@@ skipping 89 matching lines @@
 }
 
 CreateChromeApplicationShortcutsDialogGtk::
     ~CreateChromeApplicationShortcutsDialogGtk() {
   if (!close_callback_.is_null())
     close_callback_.Run();
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutsDialogGtk::OnShortcutInfoLoaded(
-  const ShellIntegration::ShortcutInfo& shortcut_info) {
+  const web_app::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CreateIconPixBuf(shortcut_info_.favicon);
   CreateDialogBox(parent_);
 }
 
 void CreateChromeApplicationShortcutsDialogGtk::CreateDesktopShortcut(
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations) {
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (web_app::internals::CreateShortcutsOnFileThread(
           web_app::SHORTCUT_CREATION_BY_USER,
           creation_locations,
           shortcut_info)) {
     Release();
   } else {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog,
                    this));
   }
 }