summaryrefslogtreecommitdiffstats
path: root/ash/shell_factory.h
diff options
context:
space:
mode:
authorvollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 20:48:22 +0000
committervollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 20:48:22 +0000
commit22a0ce51a95b7019eac17c2a12020a275dd42a5d (patch)
tree8718d727bd30ddb166e4751226cf999339d00b63 /ash/shell_factory.h
parent2bd996f4d9d348d33f1f6ae24f124faa03b3c221 (diff)
downloadchromium_src-22a0ce51a95b7019eac17c2a12020a275dd42a5d.zip
chromium_src-22a0ce51a95b7019eac17c2a12020a275dd42a5d.tar.gz
chromium_src-22a0ce51a95b7019eac17c2a12020a275dd42a5d.tar.bz2
Revert 133468 - Fix wallpaper fade animation flashing problem.
This CL fix the wallpaper fade animation problem. The problem was when user switched to a new wallpaper, it seems there is a white flashing before new wallpaper fade in. The reason was I started the hide animation before loading new wallpaper. And it took around 300ms to load while the animation finished around 200ms. So there is 100ms period where the background color (white) showed up. I delayed the hide animation, but then another problem showed up. Now the show and hide animation happened at the same time. At some point in the animation, the background color will have 25% opacity and it also cause a flashing. To fix all, this CL only animate on Show new wallpaper and delete the old widget after the Show animation completed. BUG=118651 TEST=Change wallpaper in chromeos, and verify if the animation is smooth. Review URL: http://codereview.chromium.org/10146016 TBR=bshe@chromium.org Review URL: https://chromiumcodereview.appspot.com/10184012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_factory.h')
-rw-r--r--ash/shell_factory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 03b8170..1e57953 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -21,7 +21,8 @@ class Widget;
namespace ash {
namespace internal {
-void CreateDesktopBackground(const SkBitmap& wallpaper, ImageLayout layout);
+views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper,
+ ImageLayout layout);
ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
} // namespace internal