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

Unified Diff: chrome/browser/ui/ash/launcher/browser_shortcut_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/browser_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
index d8a7f541c71cde2777ead7527cf8f9114766e5ca..8f541ef31d8902b1b0abb42c4b7a126de6b5ee5d 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -170,8 +170,9 @@ BrowserShortcutLauncherItemController::GetApplicationList(int event_flags) {
ChromeLauncherAppMenuItems items;
bool found_tabbed_browser = false;
// Add the application name to the menu.
+ base::string16 app_title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
items.push_back(
- base::MakeUnique<ChromeLauncherAppMenuItem>(GetTitle(), nullptr, false));
+ base::MakeUnique<ChromeLauncherAppMenuItem>(app_title, nullptr, false));
for (auto* browser : GetListOfActiveBrowsers()) {
TabStripModel* tab_strip = browser->tab_strip_model();
if (tab_strip->active_index() == -1)
@@ -223,10 +224,6 @@ BrowserShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
return Activate(ash::LAUNCH_FROM_UNKNOWN);
}
-base::string16 BrowserShortcutLauncherItemController::GetTitle() {
- return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-}
-
ash::ShelfMenuModel*
BrowserShortcutLauncherItemController::CreateApplicationMenu(int event_flags) {
return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));

Powered by Google App Engine
This is Rietveld 408576698