Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1341)

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2239233002: [ash-md] Fades overview header in and out (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [ash-md] Fades overview header in and out (fixed a new test assertion) Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698