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

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

Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem. (Closed)
Patch Set: Cleanup; fix ash_shell compile and a couple tests. Created 3 years, 9 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/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index fa29d04435a77876038b32df8a31787b43efed78..b1b3f8f600535e797fce50e8b101e0d7703b83cb 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -570,7 +570,7 @@ ash::ShelfAction ChromeLauncherControllerImpl::ActivateWindowOrMinimizeIfActive(
if (window->IsActive() && allow_minimize) {
window->Minimize();
- return ash::SHELF_ACTION_NONE;
+ return ash::SHELF_ACTION_WINDOW_MINIMIZED;
James Cook 2017/03/09 01:09:47 Weird that it was NONE before. Was that a bug?
msw 2017/03/10 06:17:57 Yeah, it seems so... the difference between these
}
window->Show();
@@ -615,12 +615,12 @@ void ChromeLauncherControllerImpl::AdditionalUserAddedToSession(
controller->AdditionalUserAddedToSession(profile);
}
-ash::ShelfAppMenuItemList
+ash::ShelfItemDelegate::MenuItemList
ChromeLauncherControllerImpl::GetAppMenuItemsForTesting(
const ash::ShelfItem& item) {
LauncherItemController* controller = GetLauncherItemController(item.id);
return controller ? controller->GetAppMenuItems(ui::EF_NONE)
- : ash::ShelfAppMenuItemList();
+ : ash::ShelfItemDelegate::MenuItemList();
}
std::vector<content::WebContents*>

Powered by Google App Engine
This is Rietveld 408576698