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

Unified Diff: ash/system/overview/overview_button_tray_unittest.cc

Issue 251193004: Animate the OverviewButtonTray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « no previous file | ash/system/tray/system_tray_unittest.cc » ('j') | ash/system/tray/tray_background_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index bc3fd695031be4bc6dbe61263f6e00725c0ed365..fcf241e97d92fbc59018ae08adbd5bcc60c0d81e 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
+#include "ash/system/tray/tray_background_view.h"
#include "ash/system/user/login_status.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/status_area_widget_test_helper.h"
@@ -41,6 +42,11 @@ class OverviewButtonTrayTest : public test::AshTestBase {
OverviewButtonTrayTest() {}
virtual ~OverviewButtonTrayTest() {}
+ virtual void SetUp() OVERRIDE {
+ TrayBackgroundView::DisableAnimationsForTest();
+ test::AshTestBase::SetUp();
+ }
+
protected:
views::ImageView* GetImageView(OverviewButtonTray* tray) {
return tray->icon_;
« no previous file with comments | « no previous file | ash/system/tray/system_tray_unittest.cc » ('j') | ash/system/tray/tray_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698