ash/frame/custom_frame_view_ash.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/custom_frame_view_ash.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

Index: ash/frame/custom_frame_view_ash.cc

diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc

index f4422fc796e412210b6de7c1f931a5c06d13b326..169e8aef9285266ee3f6bc5ceeb65a5e41831ca0 100644

--- a/ash/frame/custom_frame_view_ash.cc

+++ b/ash/frame/custom_frame_view_ash.cc

@@ -202,12 +202,7 @@ CustomFrameViewAsh::HeaderView::HeaderView(views::Widget* frame)

avatar_icon_(NULL),

caption_button_container_(NULL),

fullscreen_visible_fraction_(0) {

- 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_ = new FrameCaptionButtonContainerView(frame_);

caption_button_container_->UpdateSizeButtonVisibility();

AddChildView(caption_button_container_);

« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | ash/frame/default_header_painter_unittest.cc » ('j') | ash/wm/window_state.cc » ('J')