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 22 matching lines...) Expand all Loading... |
33 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.
h" | 33 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.
h" |
34 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h" | 34 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h" |
35 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h" | 35 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h" |
36 #include "chrome/browser/web_applications/web_app.h" | 36 #include "chrome/browser/web_applications/web_app.h" |
37 #include "chrome/common/chrome_notification_types.h" | 37 #include "chrome/common/chrome_notification_types.h" |
38 #include "chrome/common/extensions/extension.h" | 38 #include "chrome/common/extensions/extension.h" |
39 #include "chrome/common/extensions/extension_resource.h" | 39 #include "chrome/common/extensions/extension_resource.h" |
40 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
41 #include "content/public/browser/notification_service.h" | 41 #include "content/public/browser/notification_service.h" |
42 #include "content/public/browser/web_contents.h" | 42 #include "content/public/browser/web_contents.h" |
43 #include "grit/theme_resources.h" | 43 #include "grit/theme_resources_standard.h" |
44 #include "ui/aura/client/activation_client.h" | 44 #include "ui/aura/client/activation_client.h" |
45 #include "ui/aura/window.h" | 45 #include "ui/aura/window.h" |
46 #include "ui/views/widget/widget.h" | 46 #include "ui/views/widget/widget.h" |
47 | 47 |
48 using extensions::Extension; | 48 using extensions::Extension; |
49 | 49 |
50 // ChromeLauncherController::Item ---------------------------------------------- | 50 // ChromeLauncherController::Item ---------------------------------------------- |
51 | 51 |
52 ChromeLauncherController::Item::Item() | 52 ChromeLauncherController::Item::Item() |
53 : item_type(TYPE_TABBED_BROWSER), | 53 : item_type(TYPE_TABBED_BROWSER), |
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 } | 933 } |
934 model_->AddAt(index, item); | 934 model_->AddAt(index, item); |
935 | 935 |
936 if (!controller || controller->type() != | 936 if (!controller || controller->type() != |
937 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) { | 937 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) { |
938 if (item.status != ash::STATUS_IS_PENDING) | 938 if (item.status != ash::STATUS_IS_PENDING) |
939 app_icon_loader_->FetchImage(app_id); | 939 app_icon_loader_->FetchImage(app_id); |
940 } | 940 } |
941 return id; | 941 return id; |
942 } | 942 } |
OLD | NEW |