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 "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/launcher/launcher_model.h" | 10 #include "ash/launcher/launcher_model.h" |
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
989 } | 989 } |
990 model_->AddAt(index, item); | 990 model_->AddAt(index, item); |
991 | 991 |
992 if (!controller || controller->type() != | 992 if (!controller || controller->type() != |
993 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) { | 993 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) { |
994 if (item.status != ash::STATUS_IS_PENDING) | 994 if (item.status != ash::STATUS_IS_PENDING) |
995 app_icon_loader_->FetchImage(app_id); | 995 app_icon_loader_->FetchImage(app_id); |
996 } | 996 } |
997 return id; | 997 return id; |
998 } | 998 } |
OLD | NEW |