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

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2209443006: Show small notification icons in notification tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 4 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
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 8853ea0a46d63637d9f5abcfa9a055c72b45d61d..9c35307e8e5bfc1b20fb827d06860ca8a187b77a 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -18,6 +18,7 @@
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/shelf_tooltip_manager.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/web_notification/web_notification_tray.h"
#include "ash/common/test/material_design_controller_test_api.h"
#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
@@ -317,6 +318,8 @@ class ShelfViewTest : public AshTestBase {
Shelf* shelf = Shelf::ForPrimaryDisplay();
shelf_view_ = ShelfTestAPI(shelf).shelf_view();
+ WebNotificationTray::DisableAnimationsForTest();
+
// The bounds should be big enough for 4 buttons + overflow chevron.
shelf_view_->SetBounds(0, 0, 500, GetShelfConstant(SHELF_SIZE));

Powered by Google App Engine
This is Rietveld 408576698