| 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..27bd930cd44025dab5b3098e25b60e9cc1dbc364 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);
|
| }
|
| @@ -279,6 +283,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_);
|
|
|