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/multi_profile_uma.h" | 11 #include "ash/common/multi_profile_uma.h" |
12 #include "ash/common/shelf/shelf_model.h" | 12 #include "ash/common/shelf/shelf_model.h" |
13 #include "ash/common/shelf/wm_shelf.h" | 13 #include "ash/common/shelf/wm_shelf.h" |
14 #include "ash/common/system/tray/system_tray_delegate.h" | |
15 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
16 #include "ash/common/wm_window.h" | 15 #include "ash/common/wm_window.h" |
17 #include "ash/resources/grit/ash_resources.h" | 16 #include "ash/resources/grit/ash_resources.h" |
18 #include "ash/root_window_controller.h" | 17 #include "ash/root_window_controller.h" |
19 #include "ash/shell.h" | 18 #include "ash/shell.h" |
20 #include "ash/strings/grit/ash_strings.h" | 19 #include "ash/strings/grit/ash_strings.h" |
| 20 #include "ash/system/tray/system_tray_delegate.h" |
21 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
22 #include "base/command_line.h" | 22 #include "base/command_line.h" |
23 #include "base/macros.h" | 23 #include "base/macros.h" |
24 #include "base/strings/pattern.h" | 24 #include "base/strings/pattern.h" |
25 #include "base/strings/string_util.h" | 25 #include "base/strings/string_util.h" |
26 #include "base/strings/utf_string_conversions.h" | 26 #include "base/strings/utf_string_conversions.h" |
27 #include "base/threading/thread_task_runner_handle.h" | 27 #include "base/threading/thread_task_runner_handle.h" |
28 #include "base/values.h" | 28 #include "base/values.h" |
29 #include "build/build_config.h" | 29 #include "build/build_config.h" |
30 #include "chrome/browser/browser_process.h" | 30 #include "chrome/browser/browser_process.h" |
(...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1490 LauncherItemController* controller = GetLauncherItemController(item.id); | 1490 LauncherItemController* controller = GetLauncherItemController(item.id); |
1491 if (!controller || controller->image_set_by_controller()) | 1491 if (!controller || controller->image_set_by_controller()) |
1492 continue; | 1492 continue; |
1493 item.image = image; | 1493 item.image = image; |
1494 if (arc_deferred_launcher_) | 1494 if (arc_deferred_launcher_) |
1495 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); | 1495 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); |
1496 model_->Set(index, item); | 1496 model_->Set(index, item); |
1497 // It's possible we're waiting on more than one item, so don't break. | 1497 // It's possible we're waiting on more than one item, so don't break. |
1498 } | 1498 } |
1499 } | 1499 } |
OLD | NEW |