Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate. (Closed)
Patch Set: Sync and rebase. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
index 2ecf46e46adf5812d6b7a9c8e169a6de598071e6..3bffc110d7e453337abb98a6a2577b4c719f2d6a 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
@@ -16,10 +16,8 @@
#include "ui/base/base_window.h"
ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
- const std::string& arc_app_id,
- ChromeLauncherController* controller)
- : AppWindowLauncherItemController(ash::AppLaunchId(arc_app_id),
- controller) {}
+ const std::string& arc_app_id)
+ : AppWindowLauncherItemController(ash::AppLaunchId(arc_app_id)) {}
ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
@@ -60,11 +58,11 @@ void ArcAppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,
ActivateIndexedApp(command_id);
}
-MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
+ash::MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
int event_flags) {
- MenuItemList items;
+ ash::MenuItemList items;
base::string16 app_title = LauncherControllerHelper::GetAppTitle(
- launcher_controller()->profile(), app_id());
+ ChromeLauncherController::instance()->profile(), app_id());
for (auto it = windows().begin(); it != windows().end(); ++it) {
// TODO(khmel): resolve correct icon here.
size_t i = std::distance(windows().begin(), it);

Powered by Google App Engine
This is Rietveld 408576698