Revert of Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize()

ash/frame/custom_frame_view_ash.cc

 // Copyright (c) 2012 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 "ash/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 184 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HeaderView);
 };
 
 CustomFrameViewAsh::HeaderView::HeaderView(views::Widget* frame)
     : frame_(frame),
       header_painter_(new ash::DefaultHeaderPainter),
       avatar_icon_(NULL),
       caption_button_container_(NULL),
       fullscreen_visible_fraction_(0) {
-  caption_button_container_ = new FrameCaptionButtonContainerView(frame_);
+  FrameCaptionButtonContainerView::MinimizeAllowed minimize_allowed =
+      frame_->widget_delegate()->CanMinimize() ?
+          FrameCaptionButtonContainerView::MINIMIZE_ALLOWED :
+          FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED;
+  caption_button_container_ = new FrameCaptionButtonContainerView(frame_,
+      minimize_allowed);
   caption_button_container_->UpdateSizeButtonVisibility();
   AddChildView(caption_button_container_);
 
   header_painter_->Init(frame_, this, caption_button_container_);
   UpdateAvatarIcon();
 
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 CustomFrameViewAsh::HeaderView::~HeaderView() {
@@ skipping 357 matching lines @@
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash