Re-land:

views/window/window_win.h

 // Copyright (c) 2011 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 VIEWS_WINDOW_WINDOW_WIN_H_
 #define VIEWS_WINDOW_WINDOW_WIN_H_
 #pragma once
 
 #include "views/widget/widget_win.h"
 #include "views/window/native_window.h"
@@ skipping 23 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // WindowWin
 //
 //  A WindowWin is a WidgetWin that has a caption and a border. The frame is
 //  rendered by the operating system.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class WindowWin : public WidgetWin,
-                  public NativeWindow,
-                  public Window {
+                  public NativeWindow {
  public:
-  WindowWin();
+  explicit WindowWin(internal::NativeWindowDelegate* delegate);
   virtual ~WindowWin();
 
   // Show the window with the specified show command.
   void Show(int show_state);
 
   // Accessors and setters for various properties.
   void set_focus_on_creation(bool focus_on_creation) {
     focus_on_creation_ = focus_on_creation;
   }
 
   // Hides the window if it hasn't already been force-hidden. The force hidden
   // count is tracked, so calling multiple times is allowed, you just have to
   // be sure to call PopForceHidden the same number of times.
   void PushForceHidden();
 
   // Decrements the force hidden count, showing the window if we have reached
   // the top of the stack. See PushForceHidden.
   void PopForceHidden();
 
   // Returns the system set window title font.
   static gfx::Font GetWindowTitleFont();
 
+  // Overridden from NativeWindow:
+  virtual Window* GetWindow() OVERRIDE;
+  virtual const Window* GetWindow() const OVERRIDE;
+
  protected:
   friend Window;
 
   // Returns the insets of the client area relative to the non-client area of
   // the window. Override this function instead of OnNCCalcSize, which is
   // crazily complicated.
   virtual gfx::Insets GetClientAreaInsets() const;
 
   // Retrieve the show state of the window. This is one of the SW_SHOW* flags
   // passed into Windows' ShowWindow method. For normal windows this defaults
@@ skipping 36 matching lines @@
                                      LPARAM l_param) OVERRIDE;
   virtual LRESULT OnNCUAHDrawFrame(UINT msg,
                                    WPARAM w_param,
                                    LPARAM l_param) OVERRIDE;
   virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon) OVERRIDE;
   virtual LRESULT OnSetText(const wchar_t* text) OVERRIDE;
   virtual void OnSettingChange(UINT flags, const wchar_t* section) OVERRIDE;
   virtual void OnSize(UINT size_param, const CSize& new_size) OVERRIDE;
   virtual void OnSysCommand(UINT notification_code, CPoint click) OVERRIDE;
   virtual void OnWindowPosChanging(WINDOWPOS* window_pos) OVERRIDE;
-  virtual Window* GetWindow() OVERRIDE { return this; }
-  virtual const Window* GetWindow() const OVERRIDE { return this; }
   virtual void Close() OVERRIDE;
   virtual void SetInitialFocus() OVERRIDE;
 
   // Overridden from NativeWindow:
   virtual NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const NativeWidget* AsNativeWidget() const OVERRIDE;
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual void ShowNativeWindow(ShowState state) OVERRIDE;
   virtual void BecomeModal() OVERRIDE;
   virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
@@ skipping 14 matching lines @@
   virtual void Maximize() OVERRIDE;
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsVisible() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
   virtual bool IsMinimized() const OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;
   virtual bool IsFullscreen() const OVERRIDE;
   virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
-  virtual bool IsAppWindow() const OVERRIDE;
   virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE;
   virtual NonClientFrameView* CreateFrameViewForWindow() OVERRIDE;
   virtual void UpdateFrameAfterFrameChange() OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
 
  private:
   // Information saved before going into fullscreen mode, used to restore the
   // window afterwards.
@@ skipping 94 matching lines @@
 
   // True when the window is being moved/sized.
   bool is_in_size_move_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WINDOW_WINDOW_WIN_H_