Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

views/window/window.cc

 // 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.
 
 #include "views/window/window.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 19 matching lines @@
 }
 
 Window::Window()
     : native_window_(NULL),
       window_delegate_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           non_client_view_(new NonClientView(this))),
       saved_maximized_state_(false),
       minimum_size_(100, 100),
       disable_inactive_rendering_(false),
-      window_closed_(false),
-      frame_type_(FRAME_TYPE_DEFAULT) {
+      window_closed_(false) {
 }
 
 Window::~Window() {
 }
 
 // static
 Window* Window::CreateChromeWindow(gfx::NativeWindow parent,
                                    const gfx::Rect& bounds,
                                    WindowDelegate* window_delegate) {
   Window* window = new Window;
@@ skipping 180 matching lines @@
 
 void Window::UpdateFrameAfterFrameChange() {
   native_window_->UpdateFrameAfterFrameChange();
 }
 
 gfx::NativeWindow Window::GetNativeWindow() const {
   return native_window_->GetNativeWindow();
 }
 
 bool Window::ShouldUseNativeFrame() const {
-  if (frame_type_ != FRAME_TYPE_DEFAULT)
-    return frame_type_ == FRAME_TYPE_FORCE_NATIVE;
   return native_window_->ShouldUseNativeFrame();
 }
 
-void Window::DebugToggleFrameType() {
-  if (frame_type_ == FRAME_TYPE_DEFAULT) {
-    frame_type_ = ShouldUseNativeFrame() ? FRAME_TYPE_FORCE_CUSTOM :
-        FRAME_TYPE_FORCE_NATIVE;
-  } else {
-    frame_type_ = frame_type_ == FRAME_TYPE_FORCE_CUSTOM ?
-        FRAME_TYPE_FORCE_NATIVE : FRAME_TYPE_FORCE_CUSTOM;
-  }
-  FrameTypeChanged();
-}
-
 void Window::FrameTypeChanged() {
   native_window_->FrameTypeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Window, internal::NativeWindowDelegate implementation:
 
 bool Window::CanActivate() const {
   return window_delegate_->CanActivate();
 }
 
 bool Window::IsInactiveRenderingDisabled() const {
   return disable_inactive_rendering_;
 }
 
 void Window::EnableInactiveRendering() {
   disable_inactive_rendering_ = false;
   non_client_view_->DisableInactiveRendering(false);
 }
 
 bool Window::IsModal() const {
   return window_delegate_->IsModal();
 }
 
 bool Window::IsDialogBox() const {
   return !!window_delegate_->AsDialogDelegate();
 }
 
+bool Window::IsUsingNativeFrame() const {
+  return non_client_view_->UseNativeFrame();
+}
+
 gfx::Size Window::GetMinimumSize() const {
   return non_client_view_->GetMinimumSize();
 }
 
 int Window::GetNonClientComponent(const gfx::Point& point) const {
   return non_client_view_->NonClientHitTest(point);
 }
 
 bool Window::ExecuteCommand(int command_id) {
   return window_delegate_->ExecuteWindowsCommand(command_id);
@@ skipping 114 matching lines @@
   if (!window_delegate_)
     return;
 
   bool maximized;
   gfx::Rect bounds;
   native_window_->GetWindowBoundsAndMaximizedState(&bounds, &maximized);
   window_delegate_->SaveWindowPlacement(bounds, maximized);
 }
 
 }  // namespace views