| Index: ash/wm/window_util.cc
|
| diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
|
| index b3a9b5d703a214523e3d9ad3fd2e4ef573baaafe..97e27615b7aa93d91acd53d22c63fe51fe40925a 100644
|
| --- a/ash/wm/window_util.cc
|
| +++ b/ash/wm/window_util.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <vector>
|
|
|
| +#include "ash/ash_constants.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/activation_controller.h"
|
| #include "ash/wm/window_properties.h"
|
| @@ -73,11 +74,11 @@ bool CanActivateWindow(aura::Window* window) {
|
| return client && client->CanActivateWindow(window);
|
| }
|
|
|
| -bool CanMaximizeWindow(aura::Window* window) {
|
| +bool CanMaximizeWindow(const aura::Window* window) {
|
| return window->GetProperty(aura::client::kCanMaximizeKey);
|
| }
|
|
|
| -bool IsWindowNormal(aura::Window* window) {
|
| +bool IsWindowNormal(const aura::Window* window) {
|
| return IsWindowStateNormal(window->GetProperty(aura::client::kShowStateKey));
|
| }
|
|
|
| @@ -85,17 +86,17 @@ bool IsWindowStateNormal(ui::WindowShowState state) {
|
| return state == ui::SHOW_STATE_NORMAL || state == ui::SHOW_STATE_DEFAULT;
|
| }
|
|
|
| -bool IsWindowMaximized(aura::Window* window) {
|
| +bool IsWindowMaximized(const aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_MAXIMIZED;
|
| }
|
|
|
| -bool IsWindowMinimized(aura::Window* window) {
|
| +bool IsWindowMinimized(const aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_MINIMIZED;
|
| }
|
|
|
| -bool IsWindowFullscreen(aura::Window* window) {
|
| +bool IsWindowFullscreen(const aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_FULLSCREEN;
|
| }
|
| @@ -153,5 +154,23 @@ void DeepDeleteLayers(ui::Layer* layer) {
|
| delete layer;
|
| }
|
|
|
| +bool IsWindowPositionManaged(const aura::Window* window) {
|
| + return window->GetProperty(ash::internal::kWindowPositionManagedKey);
|
| +}
|
| +
|
| +void SetWindowPositionManaged(aura::Window* window, bool managed) {
|
| + window->SetProperty(ash::internal::kWindowPositionManagedKey, managed);
|
| +}
|
| +
|
| +bool HasUserChangedWindowPositionOrSize(const aura::Window* window) {
|
| + return window->GetProperty(
|
| + ash::internal::kUserChangedWindowPositionOrSizeKey);
|
| +}
|
| +
|
| +void SetUserHasChangedWindowPositionOrSize(aura::Window* window, bool changed) {
|
| + window->SetProperty(ash::internal::kUserChangedWindowPositionOrSizeKey,
|
| + changed);
|
| +}
|
| +
|
| } // namespace wm
|
| } // namespace ash
|
|
|