| 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/common/ash_switches.h" | |
| 12 #include "ash/common/multi_profile_uma.h" | 11 #include "ash/common/multi_profile_uma.h" |
| 13 #include "ash/common/shelf/shelf_model.h" | 12 #include "ash/common/shelf/shelf_model.h" |
| 14 #include "ash/common/shelf/shelf_widget.h" | 13 #include "ash/common/shelf/shelf_widget.h" |
| 15 #include "ash/common/shelf/wm_shelf.h" | 14 #include "ash/common/shelf/wm_shelf.h" |
| 16 #include "ash/common/system/tray/system_tray_delegate.h" | 15 #include "ash/common/system/tray/system_tray_delegate.h" |
| 17 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
| 18 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
| 19 #include "ash/resources/grit/ash_resources.h" | 18 #include "ash/resources/grit/ash_resources.h" |
| 20 #include "ash/root_window_controller.h" | 19 #include "ash/root_window_controller.h" |
| 21 #include "ash/shell.h" | 20 #include "ash/shell.h" |
| (...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1687 if (index == -1) | 1686 if (index == -1) |
| 1688 continue; | 1687 continue; |
| 1689 ash::ShelfItem item = model_->items()[index]; | 1688 ash::ShelfItem item = model_->items()[index]; |
| 1690 item.image = image; | 1689 item.image = image; |
| 1691 if (arc_deferred_launcher_) | 1690 if (arc_deferred_launcher_) |
| 1692 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); | 1691 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); |
| 1693 model_->Set(index, item); | 1692 model_->Set(index, item); |
| 1694 // It's possible we're waiting on more than one item, so don't break. | 1693 // It's possible we're waiting on more than one item, so don't break. |
| 1695 } | 1694 } |
| 1696 } | 1695 } |
| OLD | NEW |