ash/shelf/shelf_layout_manager.cc - Issue 24108003: [Cleanup] Rename WindowSettings to WindowState

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/shelf/shelf_layout_manager.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (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:

Index: ash/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index 0d94aa48c19d4c4b01aa87d1e49eb4e569163a55..6e00fcee687e81fb02d58baf4ce9040b65f99c96 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -27,6 +27,7 @@

#include "ash/wm/mru_window_tracker.h"

#include "ash/wm/window_animations.h"

#include "ash/wm/window_properties.h"

+#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

#include "ash/wm/workspace_controller.h"

#include "base/auto_reset.h"

@@ -1005,7 +1006,7 @@ ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(

bool visible_window = false;

for (size_t i = 0; i < windows.size(); ++i) {

if (windows[i] && windows[i]->IsVisible() &&

- !ash::wm::IsWindowMinimized(windows[i]) &&

+ !wm::GetWindowState(windows[i])->IsMinimized() &&

root_window_ == windows[i]->GetRootWindow()) {

visible_window = true;

break;