Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

views/window/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_WINDOW_WINDOW_H_
 #define VIEWS_WINDOW_WINDOW_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
 #include "views/widget/widget.h"
@@ skipping 34 matching lines @@
   struct InitParams {
     // |window_delegate| cannot be NULL.
     explicit InitParams(WindowDelegate* window_delegate);
 
     WindowDelegate* window_delegate;
     gfx::NativeWindow parent_window;
     NativeWindow* native_window;
     Widget::InitParams widget_init_params;
   };
 
-  enum FrameType {
-    FRAME_TYPE_DEFAULT,         // Use whatever the default would be.
-    FRAME_TYPE_FORCE_CUSTOM,    // Force the custom frame.
-    FRAME_TYPE_FORCE_NATIVE     // Force the native frame.
-  };
-
   Window();
   virtual ~Window();
 
   // Creates an instance of an object implementing this interface.
   // TODO(beng): create a version of this function that takes a NativeView, for
   //             constrained windows.
   static Window* CreateChromeWindow(gfx::NativeWindow parent,
                                     const gfx::Rect& bounds,
                                     WindowDelegate* window_delegate);
 
@@ skipping 90 matching lines @@
 
   // Creates an appropriate NonClientFrameView for this window.
   virtual NonClientFrameView* CreateFrameViewForWindow();
 
   // Updates the frame after an event caused it to be changed.
   virtual void UpdateFrameAfterFrameChange();
 
   // Retrieves the Window's native window handle.
   gfx::NativeWindow GetNativeWindow() const;
 
-  void set_frame_type(FrameType frame_type) { frame_type_ = frame_type; }
-  FrameType frame_type() const { return frame_type_; }
-
   // Whether we should be using a native frame.
   bool ShouldUseNativeFrame() const;
 
-  // Forces the frame into the alternate frame type (custom or native) depending
-  // on its current state.
-  void DebugToggleFrameType();
-
   // Tell the window that something caused the frame type to change.
   void FrameTypeChanged();
 
   WindowDelegate* window_delegate() {
     return const_cast<WindowDelegate*>(
         const_cast<const Window*>(this)->window_delegate());
   }
   const WindowDelegate* window_delegate() const {
     return window_delegate_;
   }
@@ skipping 16 matching lines @@
 
   NativeWindow* native_window() { return native_window_; }
 
  protected:
   // Overridden from NativeWindowDelegate:
   virtual bool CanActivate() const OVERRIDE;
   virtual bool IsInactiveRenderingDisabled() const OVERRIDE;
   virtual void EnableInactiveRendering() OVERRIDE;
   virtual bool IsModal() const OVERRIDE;
   virtual bool IsDialogBox() const OVERRIDE;
+  virtual bool IsUsingNativeFrame() const OVERRIDE;
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual bool ExecuteCommand(int command_id) OVERRIDE;
   virtual void OnNativeWindowCreated(const gfx::Rect& bounds) OVERRIDE;
   virtual void OnNativeWindowActivationChanged(bool active) OVERRIDE;
   virtual void OnNativeWindowBeginUserBoundsChange() OVERRIDE;
   virtual void OnNativeWindowEndUserBoundsChange() OVERRIDE;
   virtual void OnNativeWindowDestroying() OVERRIDE;
   virtual void OnNativeWindowDestroyed() OVERRIDE;
   virtual void OnNativeWindowBoundsChanged() OVERRIDE;
@@ skipping 26 matching lines @@
   // The smallest size the window can be.
   gfx::Size minimum_size_;
 
   // True when the window should be rendered as active, regardless of whether
   // or not it actually is.
   bool disable_inactive_rendering_;
 
   // Set to true if the window is in the process of closing .
   bool window_closed_;
 
-  // The current frame type in use by this window. Defaults to
-  // FRAME_TYPE_DEFAULT.
-  FrameType frame_type_;
-
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WINDOW_WINDOW_H_