| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_item_view.h" | 5 #include "ui/app_list/app_list_item_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 UpdateIcon(); | 179 UpdateIcon(); |
| 180 } | 180 } |
| 181 | 181 |
| 182 void AppListItemView::UpdateIcon() { | 182 void AppListItemView::UpdateIcon() { |
| 183 // Skip if |icon_size_| has not been determined. | 183 // Skip if |icon_size_| has not been determined. |
| 184 if (icon_size_.IsEmpty()) | 184 if (icon_size_.IsEmpty()) |
| 185 return; | 185 return; |
| 186 | 186 |
| 187 gfx::ImageSkia icon = model_->icon(); | 187 gfx::ImageSkia icon = model_->icon(); |
| 188 // Clear icon and bail out if model icon is empty. | 188 // Clear icon and bail out if model icon is empty. |
| 189 if (icon.empty()) { | 189 if (icon.isNull()) { |
| 190 icon_->SetImage(NULL); | 190 icon_->SetImage(NULL); |
| 191 return; | 191 return; |
| 192 } | 192 } |
| 193 | 193 |
| 194 CancelPendingIconOperation(); | 194 CancelPendingIconOperation(); |
| 195 | 195 |
| 196 gfx::ImageSkia shadow; | 196 gfx::ImageSkia shadow; |
| 197 if (IconCache::GetInstance()->Get(icon, icon_size_, &shadow)) { | 197 if (IconCache::GetInstance()->Get(icon, icon_size_, &shadow)) { |
| 198 icon_->SetImage(shadow); | 198 icon_->SetImage(shadow); |
| 199 } else { | 199 } else { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 apps_grid_view_->SetSelectedItem(this); | 308 apps_grid_view_->SetSelectedItem(this); |
| 309 title_->SetEnabledColor(kTitleHoverColor); | 309 title_->SetEnabledColor(kTitleHoverColor); |
| 310 } else { | 310 } else { |
| 311 apps_grid_view_->ClearSelectedItem(this); | 311 apps_grid_view_->ClearSelectedItem(this); |
| 312 model_->SetHighlighted(false); | 312 model_->SetHighlighted(false); |
| 313 title_->SetEnabledColor(kTitleColor); | 313 title_->SetEnabledColor(kTitleColor); |
| 314 } | 314 } |
| 315 } | 315 } |
| 316 | 316 |
| 317 } // namespace app_list | 317 } // namespace app_list |
| OLD | NEW |