Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h

 // Copyright 2014 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_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
 
-#include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
+#include "chrome/browser/web_applications/web_app.h"

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

Should be able to just forward declare web_app::ShortcutInfo and move include
into .cc.

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

Done.

 
 class GlassAppWindowFrameViewWin;
 
 // Windows-specific parts of the views-backed native shell window implementation
 // for packaged apps.
 class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
  public:
   ChromeNativeAppWindowViewsWin();
 
   GlassAppWindowFrameViewWin* glass_frame_view() {
     return glass_frame_view_;
   };
 
  private:
   void ActivateParentDesktopIfNecessary();
 
   void OnShortcutInfoLoaded(
-      const ShellIntegration::ShortcutInfo& shortcut_info);
+      const web_app::ShortcutInfo& shortcut_info);
 
   HWND GetNativeAppWindowHWND() const;
 
   // Overridden from ChromeNativeAppWindowViews:
   virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
                                   views::Widget* widget) OVERRIDE;
   virtual void InitializeDefaultWindow(
       const apps::AppWindow::CreateParams& create_params) OVERRIDE;
   virtual views::NonClientFrameView* CreateStandardDesktopAppFrame() OVERRIDE;
   virtual apps::AppWindowFrameView* CreateNonStandardAppFrame() OVERRIDE;
@@ skipping 13 matching lines @@
   // throughout the life of a window, e.g. if DWM is enabled and disabled.
   GlassAppWindowFrameViewWin* glass_frame_view_;
 
   // The Windows Application User Model ID identifying the app.
   base::string16 app_model_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_