summaryrefslogtreecommitdiffstats
path: root/ash/wm/caption_buttons/frame_caption_button_container_view.cc
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 21:34:34 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 21:34:34 +0000
commitbafcc453bf5b89e3092f7c2c0814cce65247d36a (patch)
treec91391207d413a289a2c6b8843db47e95c7902d5 /ash/wm/caption_buttons/frame_caption_button_container_view.cc
parenta69bb085e0e90213462182c7f8c61f4caf017868 (diff)
downloadchromium_src-bafcc453bf5b89e3092f7c2c0814cce65247d36a.zip
chromium_src-bafcc453bf5b89e3092f7c2c0814cce65247d36a.tar.gz
chromium_src-bafcc453bf5b89e3092f7c2c0814cce65247d36a.tar.bz2
Cache the views::Widget* instead of the views::NonClientFrameView* that the FrameMaximizeButton acts on
BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/24048003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/caption_buttons/frame_caption_button_container_view.cc')
-rw-r--r--ash/wm/caption_buttons/frame_caption_button_container_view.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/wm/caption_buttons/frame_caption_button_container_view.cc b/ash/wm/caption_buttons/frame_caption_button_container_view.cc
index 7609978..3425afa4 100644
--- a/ash/wm/caption_buttons/frame_caption_button_container_view.cc
+++ b/ash/wm/caption_buttons/frame_caption_button_container_view.cc
@@ -21,7 +21,6 @@
#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 {
@@ -65,7 +64,6 @@ const char FrameCaptionButtonContainerView::kViewClassName[] =
"FrameCaptionButtonContainerView";
FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
- views::NonClientFrameView* frame_view,
views::Widget* frame,
MinimizeAllowed minimize_allowed)
: frame_(frame),
@@ -85,7 +83,7 @@ FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
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);
}