| Index: ash/aura/wm_window_aura.cc
|
| diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
|
| index e4c6b75a7a16d072a3542d81c1f9c50559a9a3db..6351b2fe7375e6a29e38f400254aff3868941f35 100644
|
| --- a/ash/aura/wm_window_aura.cc
|
| +++ b/ash/aura/wm_window_aura.cc
|
| @@ -253,6 +253,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);
|
| }
|
| @@ -284,6 +288,23 @@ bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
|
| return false;
|
| }
|
|
|
| +SkColor WmWindowAura::GetColorProperty(WmWindowProperty key) {
|
| + if (key == WmWindowProperty::TOP_VIEW_COLOR)
|
| + return window_->GetProperty(aura::client::kTopViewColor);
|
| +
|
| + NOTREACHED();
|
| + return 0;
|
| +}
|
| +
|
| +void WmWindowAura::SetColorProperty(WmWindowProperty key, SkColor value) {
|
| + if (key == WmWindowProperty::TOP_VIEW_COLOR) {
|
| + window_->SetProperty(aura::client::kTopViewColor, value);
|
| + return;
|
| + }
|
| +
|
| + NOTREACHED();
|
| +}
|
| +
|
| int WmWindowAura::GetIntProperty(WmWindowProperty key) {
|
| if (key == WmWindowProperty::SHELF_ID)
|
| return GetShelfIDForWindow(window_);
|
|
|