Re-land:

views/window/native_window.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_WIDGET_NATIVE_WINDOW_H_
 #define VIEWS_WIDGET_NATIVE_WINDOW_H_
 #pragma once
 
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 19 matching lines @@
 class NativeWindow {
  public:
   enum ShowState {
     SHOW_RESTORED,
     SHOW_MAXIMIZED,
     SHOW_INACTIVE
   };
 
   virtual ~NativeWindow() {}
 
-  static Window* CreateNativeWindow();
+  // Creates an appropriate default NativeWindow implementation for the current
+  // OS/circumstance.
+  static NativeWindow* CreateNativeWindow(
+      internal::NativeWindowDelegate* delegate);
 
   virtual Window* GetWindow() = 0;
+  virtual const Window* GetWindow() const = 0;
 
   virtual NativeWidget* AsNativeWidget() = 0;
   virtual const NativeWidget* AsNativeWidget() const = 0;
 
  protected:
   friend class Window;
 
   // Returns the bounds of the window in screen coordinates for its non-
   // maximized state, regardless of whether or not it is currently maximized.
   virtual gfx::Rect GetRestoredBounds() const = 0;
@@ skipping 40 matching lines @@
   virtual void Maximize() = 0;
   virtual void Minimize() = 0;
   virtual void Restore() = 0;
   virtual bool IsActive() const = 0;
   virtual bool IsVisible() const = 0;
   virtual bool IsMaximized() const = 0;
   virtual bool IsMinimized() const = 0;
   virtual void SetFullscreen(bool fullscreen) = 0;
   virtual bool IsFullscreen() const = 0;
   virtual void SetAlwaysOnTop(bool always_on_top) = 0;
-  virtual bool IsAppWindow() const = 0;
   virtual void SetUseDragFrame(bool use_drag_frame) = 0;
   virtual NonClientFrameView* CreateFrameViewForWindow() = 0;
   virtual void UpdateFrameAfterFrameChange() = 0;
   virtual gfx::NativeWindow GetNativeWindow() const = 0;
   virtual bool ShouldUseNativeFrame() const = 0;
   virtual void FrameTypeChanged() = 0;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WINDOW_H_