Revert 251029 "Move Windows-specific code into NativeAppWindowVi..."

trunk/src/chrome/browser/ui/views/apps/native_app_window_views.h

Index: trunk/src/chrome/browser/ui/views/apps/native_app_window_views.h
===================================================================
--- trunk/src/chrome/browser/ui/views/apps/native_app_window_views.h	(revision 251061)
+++ trunk/src/chrome/browser/ui/views/apps/native_app_window_views.h	(working copy)
@@ -18,6 +18,10 @@
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/shell_integration.h"
+#endif
+
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
@@ -79,16 +83,14 @@
   const extensions::Extension* extension() {
     return shell_window_->extension();
   }
-  const views::Widget* window() const { return window_; }
 
-  virtual void InitializeDefaultWindow(
-      const apps::ShellWindow::CreateParams& create_params);
-  virtual void InitializePanelWindow(
-      const apps::ShellWindow::CreateParams& create_params);
-
  private:
   friend class ShapedAppWindowTargeterTest;
 
+  void InitializeDefaultWindow(
+      const apps::ShellWindow::CreateParams& create_params);
+  void InitializePanelWindow(
+      const apps::ShellWindow::CreateParams& create_params);
   void OnViewWasResized();
 
   bool ShouldUseChromeStyleFrame() const;
@@ -96,6 +98,12 @@
   // Caller owns the returned object.
   apps::ShellWindowFrameView* CreateShellWindowFrameView();
 
+#if defined(OS_WIN)
+  void OnShortcutInfoLoaded(
+      const ShellIntegration::ShortcutInfo& shortcut_info);
+  HWND GetNativeAppWindowHWND() const;
+#endif
+
   // ui::BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;