summaryrefslogtreecommitdiffstats
path: root/ash/desktop_background
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 19:31:58 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 19:31:58 +0000
commit63807dfc506cf686f04ca0b36be6e54b125f4660 (patch)
tree6d1493a1823f888d0855cf8f5274292e910f54e5 /ash/desktop_background
parent1bbe34527a5355885bb7843c698aba7ab510ec30 (diff)
downloadchromium_src-63807dfc506cf686f04ca0b36be6e54b125f4660.zip
chromium_src-63807dfc506cf686f04ca0b36be6e54b125f4660.tar.gz
chromium_src-63807dfc506cf686f04ca0b36be6e54b125f4660.tar.bz2
CrOS: Enable threaded UI compositor by default.
BUG=173417 Review URL: https://chromiumcodereview.appspot.com/12088092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
-rw-r--r--ash/desktop_background/desktop_background_view.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index d04efd1..35e7d0d 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -61,7 +61,6 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
}
virtual void OnImplicitAnimationsCompleted() OVERRIDE {
- DCHECK(desktop_widget_);
GetRootWindowController(root_window_)->HandleDesktopBackgroundVisible();
ash::Shell::GetInstance()->user_wallpaper_delegate()->
OnWallpaperAnimationFinished();