summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 03:53:02 +0000
committerskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 03:53:02 +0000
commit546c4626f1c323a9b28699f2a398a0a42c1bc4bf (patch)
tree203b2979c6ab4552bbc5a6e6dee736f3ba1b4231 /ash
parenta75c5d7af3027ac8f5779e1c04da78ccd08aa102 (diff)
downloadchromium_src-546c4626f1c323a9b28699f2a398a0a42c1bc4bf.zip
chromium_src-546c4626f1c323a9b28699f2a398a0a42c1bc4bf.tar.gz
chromium_src-546c4626f1c323a9b28699f2a398a0a42c1bc4bf.tar.bz2
Fixing "black flash" when going into maximized mode.
BUG=visible Review URL: https://codereview.chromium.org/268783005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/maximize_mode/maximize_mode_window_state.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
index df98796..e150fea2 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -264,7 +264,12 @@ void MaximizeModeWindowState::UpdateBounds(wm::WindowState* window_state,
!animated) {
window_state->SetBoundsDirect(bounds_in_parent);
} else {
- window_state->SetBoundsDirectAnimated(bounds_in_parent);
+ // If we animate (to) maximized mode, we want to use the cross fade to
+ // avoid flashing.
+ if (window_state->IsMaximized())
+ window_state->SetBoundsDirectCrossFade(bounds_in_parent);
+ else
+ window_state->SetBoundsDirectAnimated(bounds_in_parent);
}
}
}