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 "ash/common/shelf/shelf_model.h" | 5 #include "ash/common/shelf/shelf_model.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/common/shelf/shelf_model_observer.h" | 10 #include "ash/common/shelf/shelf_model_observer.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 AddToResult("moved=%d", moved_count_, &result); | 30 AddToResult("moved=%d", moved_count_, &result); |
31 added_count_ = removed_count_ = changed_count_ = moved_count_ = 0; | 31 added_count_ = removed_count_ = changed_count_ = moved_count_ = 0; |
32 return result; | 32 return result; |
33 } | 33 } |
34 | 34 |
35 // ShelfModelObserver overrides: | 35 // ShelfModelObserver overrides: |
36 void ShelfItemAdded(int) override { added_count_++; } | 36 void ShelfItemAdded(int) override { added_count_++; } |
37 void ShelfItemRemoved(int, const ShelfItem&) override { removed_count_++; } | 37 void ShelfItemRemoved(int, const ShelfItem&) override { removed_count_++; } |
38 void ShelfItemChanged(int, const ShelfItem&) override { changed_count_++; } | 38 void ShelfItemChanged(int, const ShelfItem&) override { changed_count_++; } |
39 void ShelfItemMoved(int, int) override { moved_count_++; } | 39 void ShelfItemMoved(int, int) override { moved_count_++; } |
| 40 void OnSetShelfItemDelegate(ShelfID, ShelfItemDelegate*) override {} |
40 | 41 |
41 private: | 42 private: |
42 void AddToResult(const std::string& format, int count, std::string* result) { | 43 void AddToResult(const std::string& format, int count, std::string* result) { |
43 if (!count) | 44 if (!count) |
44 return; | 45 return; |
45 if (!result->empty()) | 46 if (!result->empty()) |
46 *result += " "; | 47 *result += " "; |
47 *result += base::StringPrintf(format.c_str(), count); | 48 *result += base::StringPrintf(format.c_str(), count); |
48 } | 49 } |
49 | 50 |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 // Now change the type of the second item and make sure that it is moving | 295 // Now change the type of the second item and make sure that it is moving |
295 // behind the shortcuts. | 296 // behind the shortcuts. |
296 item.type = TYPE_APP; | 297 item.type = TYPE_APP; |
297 model_->Set(app2_index, item); | 298 model_->Set(app2_index, item); |
298 | 299 |
299 // The item should have moved in front of the app launcher. | 300 // The item should have moved in front of the app launcher. |
300 EXPECT_EQ(TYPE_APP, model_->items()[4].type); | 301 EXPECT_EQ(TYPE_APP, model_->items()[4].type); |
301 } | 302 } |
302 | 303 |
303 } // namespace ash | 304 } // namespace ash |
OLD | NEW |