diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:14:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:14:29 +0000 |
| commit | 3e14cad77812fbf6606d951b60eebd4f566680db (patch) | |
| tree | 8bd39772f6ae369e9ca282a750dd61b3e81e65d5 /ui/aura_shell/window_util.cc | |
| parent | 098b2911b28bbfabde8fe38cfa45f2d6c94e2c6e (diff) | |
| download | chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.zip chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.tar.gz chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.tar.bz2 | |
Shell related switches -> aura shell switches.
Aura client window properties->client namespace.
Move WindowType to client.
BUG=none
TEST=existing automation
TBR=sky
Review URL: http://codereview.chromium.org/8968022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/window_util.cc')
| -rw-r--r-- | ui/aura_shell/window_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura_shell/window_util.cc b/ui/aura_shell/window_util.cc index d9b40b9..e3ecf9f 100644 --- a/ui/aura_shell/window_util.cc +++ b/ui/aura_shell/window_util.cc @@ -16,7 +16,7 @@ namespace aura_shell { bool IsWindowMaximized(aura::Window* window) { - return window->GetIntProperty(aura::kShowStateKey) == + return window->GetIntProperty(aura::client::kShowStateKey) == ui::SHOW_STATE_MAXIMIZED; } @@ -41,10 +41,10 @@ aura::Window* GetActivatableWindow(aura::Window* window) { } void UpdateBoundsFromShowState(aura::Window* window) { - switch (window->GetIntProperty(aura::kShowStateKey)) { + switch (window->GetIntProperty(aura::client::kShowStateKey)) { case ui::SHOW_STATE_NORMAL: { const gfx::Rect* restore = GetRestoreBounds(window); - window->SetProperty(aura::kRestoreBoundsKey, NULL); + window->SetProperty(aura::client::kRestoreBoundsKey, NULL); if (restore) window->SetBounds(*restore); delete restore; |