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

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

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)
Patch Set: Address comments. Created 3 years, 11 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/app_window_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
index 82ee61f7696204e3bdc053cc29229a87499349b6..fa22849f1bb93f665595f9bfed54f49449933b8c 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
@@ -110,8 +110,11 @@ void AppWindowLauncherItemController::ActivateIndexedApp(size_t index) {
ChromeLauncherAppMenuItems AppWindowLauncherItemController::GetApplicationList(
int event_flags) {
ChromeLauncherAppMenuItems items;
+ // Add the application name to the menu.
+ base::string16 app_title = LauncherControllerHelper::GetAppTitle(
+ launcher_controller()->profile(), app_id());
items.push_back(
- base::MakeUnique<ChromeLauncherAppMenuItem>(GetTitle(), nullptr, false));
+ base::MakeUnique<ChromeLauncherAppMenuItem>(app_title, nullptr, false));
return items;
}
@@ -132,11 +135,6 @@ AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {
}
}
-base::string16 AppWindowLauncherItemController::GetTitle() {
- return LauncherControllerHelper::GetAppTitle(launcher_controller()->profile(),
- app_id());
-}
-
void AppWindowLauncherItemController::OnWindowPropertyChanged(
aura::Window* window,
const void* key,

Powered by Google App Engine
This is Rietveld 408576698