| 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 "ui/app_list/app_list_folder_item.h" | 5 #include "ui/app_list/app_list_folder_item.h" |
| 6 | 6 |
| 7 #include "base/guid.h" | 7 #include "base/guid.h" |
| 8 #include "ui/app_list/app_list_constants.h" | 8 #include "ui/app_list/app_list_constants.h" |
| 9 #include "ui/app_list/app_list_item_list.h" | 9 #include "ui/app_list/app_list_item_list.h" |
| 10 #include "ui/gfx/geometry/rect.h" | 10 #include "ui/gfx/geometry/rect.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 return false; | 78 return false; |
| 79 } | 79 } |
| 80 return true; | 80 return true; |
| 81 } | 81 } |
| 82 | 82 |
| 83 std::string AppListFolderItem::GenerateId() { | 83 std::string AppListFolderItem::GenerateId() { |
| 84 return base::GenerateGUID(); | 84 return base::GenerateGUID(); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void AppListFolderItem::OnFolderImageUpdated() { | 87 void AppListFolderItem::OnFolderImageUpdated() { |
| 88 SetIcon(folder_image_.icon(), false); | 88 SetIcon(folder_image_.icon()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace app_list | 91 } // namespace app_list |
| OLD | NEW |