| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override { | 123 void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override { |
| 124 ++changed_; | 124 ++changed_; |
| 125 last_index_ = index; | 125 last_index_ = index; |
| 126 } | 126 } |
| 127 | 127 |
| 128 void ShelfItemMoved(int start_index, int target_index) override { | 128 void ShelfItemMoved(int start_index, int target_index) override { |
| 129 last_index_ = target_index; | 129 last_index_ = target_index; |
| 130 } | 130 } |
| 131 | 131 |
| 132 void ShelfStatusChanged() override {} | |
| 133 | |
| 134 void clear_counts() { | 132 void clear_counts() { |
| 135 added_ = 0; | 133 added_ = 0; |
| 136 removed_ = 0; | 134 removed_ = 0; |
| 137 changed_ = 0; | 135 changed_ = 0; |
| 138 last_index_ = 0; | 136 last_index_ = 0; |
| 139 } | 137 } |
| 140 | 138 |
| 141 int added() const { return added_; } | 139 int added() const { return added_; } |
| 142 int removed() const { return removed_; } | 140 int removed() const { return removed_; } |
| 143 int changed() const { return changed_; } | 141 int changed() const { return changed_; } |
| (...skipping 2713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2857 EXPECT_EQ(1, app_icon_loader1->clear_count()); | 2855 EXPECT_EQ(1, app_icon_loader1->clear_count()); |
| 2858 EXPECT_EQ(1, app_icon_loader2->fetch_count()); | 2856 EXPECT_EQ(1, app_icon_loader2->fetch_count()); |
| 2859 EXPECT_EQ(1, app_icon_loader2->clear_count()); | 2857 EXPECT_EQ(1, app_icon_loader2->clear_count()); |
| 2860 | 2858 |
| 2861 launcher_controller_->CloseLauncherItem(shelfId3); | 2859 launcher_controller_->CloseLauncherItem(shelfId3); |
| 2862 EXPECT_EQ(1, app_icon_loader1->fetch_count()); | 2860 EXPECT_EQ(1, app_icon_loader1->fetch_count()); |
| 2863 EXPECT_EQ(1, app_icon_loader1->clear_count()); | 2861 EXPECT_EQ(1, app_icon_loader1->clear_count()); |
| 2864 EXPECT_EQ(1, app_icon_loader2->fetch_count()); | 2862 EXPECT_EQ(1, app_icon_loader2->fetch_count()); |
| 2865 EXPECT_EQ(1, app_icon_loader2->clear_count()); | 2863 EXPECT_EQ(1, app_icon_loader2->clear_count()); |
| 2866 } | 2864 } |
| OLD | NEW |