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

Unified Diff: ash/common/shelf/shelf_window_watcher_unittest.cc

Issue 2514473003: Replace IDR window property use with gfx::ImageSkia icons. (Closed)
Patch Set: Add owership comments. Created 4 years, 1 month 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 | « ash/common/shelf/shelf_window_watcher.cc ('k') | ash/common/wm_window_property.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/common/shelf/shelf_window_watcher_unittest.cc b/ash/common/shelf/shelf_window_watcher_unittest.cc
index 72c65b33a5a5b75ffd89acb3c320a6364d27b3c3..7817ea1dcde7c31894b082f9dc3b0f9f6b052492 100644
--- a/ash/common/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/common/shelf/shelf_window_watcher_unittest.cc
@@ -105,10 +105,6 @@ TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItemProperties) {
// Clearing twice doesn't do anything.
window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
EXPECT_EQ(1, model_->item_count());
-
- // Setting an icon id (without a valid item type) does not add a shelf item.
- window2->SetIntProperty(WmWindowProperty::SHELF_ICON_RESOURCE_ID, 1234);
- EXPECT_EQ(1, model_->item_count());
}
TEST_F(ShelfWindowWatcherTest, ActivateWindow) {
« no previous file with comments | « ash/common/shelf/shelf_window_watcher.cc ('k') | ash/common/wm_window_property.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698