| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/arc_app_window_launcher_item_controller
.h" | 5 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller
.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" | 9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
| 10 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 10 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 ChromeLauncherAppMenuItems | 66 ChromeLauncherAppMenuItems |
| 67 ArcAppWindowLauncherItemController::GetApplicationList(int event_flags) { | 67 ArcAppWindowLauncherItemController::GetApplicationList(int event_flags) { |
| 68 ChromeLauncherAppMenuItems items = | 68 ChromeLauncherAppMenuItems items = |
| 69 AppWindowLauncherItemController::GetApplicationList(event_flags); | 69 AppWindowLauncherItemController::GetApplicationList(event_flags); |
| 70 for (auto it = windows().begin(); it != windows().end(); ++it) { | 70 for (auto it = windows().begin(); it != windows().end(); ++it) { |
| 71 // TODO(khmel): resolve correct icon here. | 71 // TODO(khmel): resolve correct icon here. |
| 72 size_t i = std::distance(windows().begin(), it); | 72 size_t i = std::distance(windows().begin(), it); |
| 73 gfx::Image image; | 73 gfx::Image image; |
| 74 aura::Window* window = (*it)->GetNativeWindow(); | 74 aura::Window* window = (*it)->GetNativeWindow(); |
| 75 items.push_back(new ChromeLauncherAppMenuItemV2App( | 75 items.push_back(new ChromeLauncherAppMenuItemV2App( |
| 76 ((window && !window->title().empty()) ? window->title() : GetTitle()), | 76 ((window && !window->GetTitle().empty()) ? window->GetTitle() |
| 77 : GetTitle()), |
| 77 &image, app_id(), launcher_controller(), i, | 78 &image, app_id(), launcher_controller(), i, |
| 78 i == 0 /* has_leading_separator */)); | 79 i == 0 /* has_leading_separator */)); |
| 79 } | 80 } |
| 80 return items; | 81 return items; |
| 81 } | 82 } |
| OLD | NEW |