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

Unified Diff: ui/app_list/app_list_menu.cc

Issue 2143893002: Purge the App Launcher code from Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comment Created 4 years, 5 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: ui/app_list/app_list_menu.cc
diff --git a/ui/app_list/app_list_menu.cc b/ui/app_list/app_list_menu.cc
index 5601f0dfe9590fd714976cf10765925610032106..89fac998c3d38fcb8534a80a9f4ea419aed8f8e3 100644
--- a/ui/app_list/app_list_menu.cc
+++ b/ui/app_list/app_list_menu.cc
@@ -30,12 +30,7 @@ void AppListMenu::InitMenu() {
// only 1 user.
if (users_.size() > 1) {
for (size_t i = 0; i < users_.size(); ++i) {
-#if defined(OS_MACOSX)
- menu_model_.AddRadioItem(SELECT_PROFILE + i,
- users_[i].email.empty() ? users_[i].name
- : users_[i].email,
- 0 /* group_id */);
-#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name);
int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
menu_model_.SetSublabel(menu_index, users_[i].email);
@@ -58,12 +53,7 @@ void AppListMenu::InitMenu() {
}
bool AppListMenu::IsCommandIdChecked(int command_id) const {
-#if defined(OS_MACOSX)
- DCHECK_LT(static_cast<unsigned>(command_id) - SELECT_PROFILE, users_.size());
- return users_[command_id - SELECT_PROFILE].active;
-#else
return false;
-#endif
}
bool AppListMenu::IsCommandIdEnabled(int command_id) const {

Powered by Google App Engine
This is Rietveld 408576698