| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/app_list/folder_image.h" | 5 #include "ui/app_list/folder_image.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 AddAppWithColoredIcon("app3", SK_ColorBLUE); | 67 AddAppWithColoredIcon("app3", SK_ColorBLUE); |
| 68 | 68 |
| 69 observer_.Reset(); | 69 observer_.Reset(); |
| 70 folder_image_.AddObserver(&observer_); | 70 folder_image_.AddObserver(&observer_); |
| 71 } | 71 } |
| 72 | 72 |
| 73 void TearDown() override { folder_image_.RemoveObserver(&observer_); } | 73 void TearDown() override { folder_image_.RemoveObserver(&observer_); } |
| 74 | 74 |
| 75 protected: | 75 protected: |
| 76 void AddAppWithColoredIcon(const std::string& id, SkColor icon_color) { | 76 void AddAppWithColoredIcon(const std::string& id, SkColor icon_color) { |
| 77 scoped_ptr<AppListItem> item(new AppListItem(id)); | 77 std::unique_ptr<AppListItem> item(new AppListItem(id)); |
| 78 item->SetIcon(CreateSquareBitmapWithColor(kListIconSize, icon_color)); | 78 item->SetIcon(CreateSquareBitmapWithColor(kListIconSize, icon_color)); |
| 79 app_list_model_.AddItem(std::move(item)); | 79 app_list_model_.AddItem(std::move(item)); |
| 80 } | 80 } |
| 81 | 81 |
| 82 AppListModel app_list_model_; | 82 AppListModel app_list_model_; |
| 83 | 83 |
| 84 FolderImage folder_image_; | 84 FolderImage folder_image_; |
| 85 | 85 |
| 86 TestFolderImageObserver observer_; | 86 TestFolderImageObserver observer_; |
| 87 | 87 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 139 |
| 140 // Change an item's icon. Ensure that the observer fired and the icon changed. | 140 // Change an item's icon. Ensure that the observer fired and the icon changed. |
| 141 app_list_model_.FindItem("app2") | 141 app_list_model_.FindItem("app2") |
| 142 ->SetIcon(CreateSquareBitmapWithColor(kListIconSize, SK_ColorMAGENTA)); | 142 ->SetIcon(CreateSquareBitmapWithColor(kListIconSize, SK_ColorMAGENTA)); |
| 143 EXPECT_TRUE(observer_.updated()); | 143 EXPECT_TRUE(observer_.updated()); |
| 144 observer_.Reset(); | 144 observer_.Reset(); |
| 145 EXPECT_FALSE(ImagesAreEqual(icon1, folder_image_.icon())); | 145 EXPECT_FALSE(ImagesAreEqual(icon1, folder_image_.icon())); |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace app_list | 148 } // namespace app_list |
| OLD | NEW |