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

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

 // Copyright 2013 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_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "apps/shell_window.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/widget/widget.h"
 #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;
 }
 #endif
 
 class ExtensionKeybindingRegistryViews;
 
 namespace apps {
 class ShellWindowFrameView;
@@ skipping 41 matching lines @@
   virtual void Show() OVERRIDE;
   virtual void Activate() OVERRIDE;
 
   content::BrowserContext* browser_context() {
     return shell_window_->browser_context();
   }
 
   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;
 
   // 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;
   virtual bool IsMinimized() const OVERRIDE;
   virtual bool IsFullscreen() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void ShowInactive() OVERRIDE;
@@ skipping 126 matching lines @@
 
   base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_