| Index: ash/aura/wm_window_aura.cc
|
| diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
|
| index f923414d7fe790cb5b17b0c18d99b55e00e06b5e..3fe4c6368e5fe28b716cdeac2d6da00516262778 100644
|
| --- a/ash/aura/wm_window_aura.cc
|
| +++ b/ash/aura/wm_window_aura.cc
|
| @@ -248,6 +248,10 @@ float WmWindowAura::GetTargetOpacity() const {
|
| return window_->layer()->GetTargetOpacity();
|
| }
|
|
|
| +gfx::Rect WmWindowAura::GetMinimizeAnimationTargetBoundsInScreen() const {
|
| + return ash::GetMinimizeAnimationTargetBoundsInScreen(window_);
|
| +}
|
| +
|
| void WmWindowAura::SetTransform(const gfx::Transform& transform) {
|
| window_->SetTransform(transform);
|
| }
|
| @@ -286,6 +290,9 @@ int WmWindowAura::GetIntProperty(WmWindowProperty key) {
|
| if (key == WmWindowProperty::TOP_VIEW_INSET)
|
| return window_->GetProperty(aura::client::kTopViewInset);
|
|
|
| + if (key == WmWindowProperty::TOP_VIEW_COLOR)
|
| + return window_->GetProperty(aura::client::kTopViewColor);
|
| +
|
| NOTREACHED();
|
| return 0;
|
| }
|
| @@ -299,6 +306,10 @@ void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
|
| window_->SetProperty(aura::client::kTopViewInset, value);
|
| return;
|
| }
|
| + if (key == WmWindowProperty::TOP_VIEW_COLOR) {
|
| + window_->SetProperty(aura::client::kTopViewColor, value);
|
| + return;
|
| + }
|
|
|
| NOTREACHED();
|
| }
|
|
|