ash/wm/caption_buttons/frame_caption_button_container_view.cc - Issue 24048003: [Refactor] Cache the views::Widget* that the FrameMaximizeButton acts on

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/caption_buttons/frame_caption_button_container_view.cc

Issue 24048003: [Refactor] Cache the views::Widget* that the FrameMaximizeButton acts on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ash/wm/caption_buttons/frame_caption_button_container_view.h ('K') | « ash/wm/caption_buttons/frame_caption_button_container_view.h ('k') | ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc » ('j') | ash/wm/caption_buttons/frame_maximize_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/caption_buttons/frame_caption_button_container_view.cc

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 76099780887c2fb375d04d09324dc141d5a470d4..3425afa45c3a32d7d80d91632673767d9ea8a4e8 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);

}