[Refactor] Cache the views::Widget* that the FrameMaximizeButton acts on

ash/wm/caption_buttons/frame_caption_button_container_view.cc

 // Copyright 2013 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/wm/caption_buttons/frame_caption_button_container_view.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/caption_buttons/alternate_frame_caption_button.h"
 #include "ash/wm/caption_buttons/frame_maximize_button.h"
 #include "ash/wm/window_settings.h"
 #include "grit/ash_resources.h"
 #include "grit/ui_strings.h"  // Accessibility names
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "ui/views/window/non_client_view.h"
 
 namespace ash {
 
 namespace {
 
 // Constants for normal button style -------------------------------------------
 
 // The distance between buttons. AlternateFrameCaptionButton::GetXOverlap() is
 // used to compute the distance between buttons for the alternate button style.
 const int kDistanceBetweenButtons = -1;
@@ skipping 23 matching lines @@
   return dst->HitTestPoint(converted);
 }
 
 }  // namespace
 
 // static
 const char FrameCaptionButtonContainerView::kViewClassName[] =
     "FrameCaptionButtonContainerView";
 
 FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
-    views::NonClientFrameView* frame_view,
     views::Widget* frame,
     MinimizeAllowed minimize_allowed)
     : frame_(frame),
       header_style_(HEADER_STYLE_SHORT),
       minimize_button_(NULL),
       size_button_(NULL),
       close_button_(NULL) {
    bool alternate_style = switches::UseAlternateFrameCaptionButtonStyle();
 
   // Insert the buttons left to right.
   if (alternate_style) {
     minimize_button_ = new AlternateFrameCaptionButton(this,
         AlternateFrameCaptionButton::ACTION_MINIMIZE);
     size_button_ = new AlternateFrameCaptionButton(this,
         AlternateFrameCaptionButton::ACTION_MAXIMIZE_RESTORE);
     close_button_ = new AlternateFrameCaptionButton(this,
         AlternateFrameCaptionButton::ACTION_CLOSE);
   } else {
     minimize_button_ = new views::ImageButton(this);
-    size_button_ = new FrameMaximizeButton(this, frame_view);
+    size_button_ = new FrameMaximizeButton(this, frame);
     close_button_ = new views::ImageButton(this);
   }
 
   minimize_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
   // Hide |minimize_button_| when using the non-alternate button style because
   // |size_button_| is capable of minimizing in this case.
   // TODO(pkotwicz): We should probably show the minimize button when in
   // "always maximized" mode.
   minimize_button_->SetVisible(
@@ skipping 250 matching lines @@
   ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
   image_button->SetImage(views::CustomButton::STATE_NORMAL,
                          resource_bundle.GetImageSkiaNamed(normal_image_id));
   image_button->SetImage(views::CustomButton::STATE_HOVERED,
                          resource_bundle.GetImageSkiaNamed(hot_image_id));
   image_button->SetImage(views::CustomButton::STATE_PRESSED,
                          resource_bundle.GetImageSkiaNamed(pushed_image_id));
 }
 
 }  // namespace ash