ash/wm/stacking_controller.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/wm/stacking_controller.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase fix 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/wm/stacking_controller.cc

diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc

index d846c78c90da75757f0b9c2671c1f9f868c44ddb..0d23d693af15550bf488e69b55d314136fca7b85 100644

--- a/ash/wm/stacking_controller.cc

+++ b/ash/wm/stacking_controller.cc

@@ -10,7 +10,7 @@

#include "ash/shell_window_ids.h"

#include "ash/wm/always_on_top_controller.h"

#include "ash/wm/coordinate_conversion.h"

-#include "ash/wm/window_settings.h"

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

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

@@ -92,7 +92,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context,

return GetContainerById(

target_root, internal::kShellWindowId_UnparentedControlContainer);

case aura::client::WINDOW_TYPE_PANEL:

- if (wm::GetWindowSettings(window)->panel_attached())

+ if (wm::GetWindowState(window)->panel_attached())

return GetContainerById(target_root,

internal::kShellWindowId_PanelContainer);

else

« no previous file with comments | « ash/wm/property_util.cc ('k') | ash/wm/stacking_controller_unittest.cc » ('j') | no next file with comments »