diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 23:38:22 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 23:38:22 +0000 |
| commit | 7a747b5992ad9de44e2653a85a6fd78254cfe535 (patch) | |
| tree | 3b626c4617a9c363dba7c68ec388b7b87aee2321 /ui | |
| parent | eaf8a342157e5bdf3fc1a8ce7817f1fb11af799e (diff) | |
| download | chromium_src-7a747b5992ad9de44e2653a85a6fd78254cfe535.zip chromium_src-7a747b5992ad9de44e2653a85a6fd78254cfe535.tar.gz chromium_src-7a747b5992ad9de44e2653a85a6fd78254cfe535.tar.bz2 | |
Wires up disabling visibility animations for aura, and explicitly
disables animations for browser tests as other wise code that gets
bounds and does calculates based on that ends up with the wrong thing.
BUG=111086
TEST=none
R=ben@chromium.org,phadjan.jr@chromium.org
TBR=phadjan.jr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9160020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/client/aura_constants.cc | 3 | ||||
| -rw-r--r-- | ui/aura/client/aura_constants.h | 6 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc index 34229e4..dd424ad 100644 --- a/ui/aura/client/aura_constants.cc +++ b/ui/aura/client/aura_constants.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,6 +9,7 @@ namespace client { // Alphabetical sort. const char kAlwaysOnTopKey[] = "AlwaysOnTop"; +const char kAnimationsDisabledKey[] = "AnimationsDisabledKey"; const char kModalKey[] = "Modal"; const char kRestoreBoundsKey[] = "RestoreBounds"; const char kRootWindowInputMethod[] = "RootWindowInputMethod"; diff --git a/ui/aura/client/aura_constants.h b/ui/aura/client/aura_constants.h index 7bd5e397..c524131 100644 --- a/ui/aura/client/aura_constants.h +++ b/ui/aura/client/aura_constants.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,6 +16,10 @@ namespace client { // A property key to store always-on-top flag. The type of the value is boolean. AURA_EXPORT extern const char kAlwaysOnTopKey[]; +// A property key to store whether animations are disabled for the window. Type +// of value is an int. +AURA_EXPORT extern const char kAnimationsDisabledKey[]; + // A property key to store the boolean property of window modality. AURA_EXPORT extern const char kModalKey[]; diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 0400abe..ae51c99 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -588,7 +588,7 @@ void NativeWidgetAura::EndMoveLoop() { } void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) { - // Nothing needed on aura. + window_->SetIntProperty(aura::client::kAnimationsDisabledKey, value ? 0 : 1); } //////////////////////////////////////////////////////////////////////////////// |