| Index: ash/wm/window_util.cc
|
| ===================================================================
|
| --- ash/wm/window_util.cc (revision 164764)
|
| +++ ash/wm/window_util.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <vector>
|
|
|
| -#include "ash/ash_constants.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/activation_controller.h"
|
| #include "ash/wm/window_properties.h"
|
| @@ -74,11 +73,11 @@
|
| return client && client->CanActivateWindow(window);
|
| }
|
|
|
| -bool CanMaximizeWindow(const aura::Window* window) {
|
| +bool CanMaximizeWindow(aura::Window* window) {
|
| return window->GetProperty(aura::client::kCanMaximizeKey);
|
| }
|
|
|
| -bool IsWindowNormal(const aura::Window* window) {
|
| +bool IsWindowNormal(aura::Window* window) {
|
| return IsWindowStateNormal(window->GetProperty(aura::client::kShowStateKey));
|
| }
|
|
|
| @@ -86,17 +85,17 @@
|
| return state == ui::SHOW_STATE_NORMAL || state == ui::SHOW_STATE_DEFAULT;
|
| }
|
|
|
| -bool IsWindowMaximized(const aura::Window* window) {
|
| +bool IsWindowMaximized(aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_MAXIMIZED;
|
| }
|
|
|
| -bool IsWindowMinimized(const aura::Window* window) {
|
| +bool IsWindowMinimized(aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_MINIMIZED;
|
| }
|
|
|
| -bool IsWindowFullscreen(const aura::Window* window) {
|
| +bool IsWindowFullscreen(aura::Window* window) {
|
| return window->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_FULLSCREEN;
|
| }
|
| @@ -154,23 +153,5 @@
|
| 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
|
|
|