ash/frame/caption_buttons/frame_caption_button_container_view.cc - Issue 613563002: Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize()

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/frame/caption_buttons/frame_caption_button_container_view.cc

Issue 613563002: Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « ash/frame/caption_buttons/frame_caption_button_container_view.h ('k') | ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc » ('j') | ash/wm/window_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/frame/caption_buttons/frame_caption_button_container_view.cc

diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc

index dd9e3eb0a020d85ce5e479e46c4550d4597aa6fe..e1672d302313ae9adc8e4fb9eab740de25ed585a 100644

--- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc

+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc

@@ -109,8 +109,7 @@ const char FrameCaptionButtonContainerView::kViewClassName[] =

"FrameCaptionButtonContainerView";

FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(

- views::Widget* frame,

- MinimizeAllowed minimize_allowed)

+ views::Widget* frame)

: frame_(frame),

minimize_button_(NULL),

size_button_(NULL),

@@ -127,7 +126,7 @@ FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(

minimize_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_MINIMIZE);

minimize_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));

- minimize_button_->SetVisible(minimize_allowed == MINIMIZE_ALLOWED);

+ minimize_button_->SetVisible(frame_->widget_delegate()->CanMinimize());

AddChildView(minimize_button_);

size_button_ = new FrameSizeButton(this, frame, this);