ash/common/frame/caption_buttons/frame_caption_button_container_view.cc - Issue 2766543002: Move even more from WmShell to Shell

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

Issue 2766543002: Move even more from WmShell to Shell (Closed)

Patch Set: Created 3 years, 9 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/common/focus_cycler.cc ('k') | ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/frame/caption_buttons/frame_caption_button_container_view.cc

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

index 3539a04c41bf45a23f8d1d837211fd21477226f5..7a99f135da9c2c8e0e3c9e02f5f9d65d1cb282fd 100644

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

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

@@ -11,6 +11,7 @@

#include "ash/common/frame/caption_buttons/frame_size_button.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm_shell.h"

+#include "ash/shell.h"

#include "ui/base/hit_test.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/compositor/scoped_animation_duration_scale_mode.h"

@@ -306,7 +307,7 @@ void FrameCaptionButtonContainerView::SetButtonIcon(FrameCaptionButton* button,

}

bool FrameCaptionButtonContainerView::ShouldSizeButtonBeVisible() const {

- return !WmShell::Get()

+ return !Shell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled() &&

frame_->widget_delegate()->CanMaximize();

« no previous file with comments | « ash/common/focus_cycler.cc ('k') | ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc » ('j') | no next file with comments »