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

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

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)
Patch Set: Cleanup Created 3 years, 10 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_deferred_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
index dbeb045297641e392eda5a2265b39650971a20c1..9c3dfe151dfbd26056ba9c598c2957450e59b736 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
@@ -32,9 +32,12 @@ base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const {
return base::Time::Now() - start_time_;
}
-ash::ShelfItemDelegate::PerformedAction
-ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) {
- return ash::ShelfItemDelegate::kNoAction;
+ash::ShelfAction ArcAppDeferredLauncherItemController::ItemSelected(
+ ui::EventType event_type,
+ int event_flags,
+ int64_t display_id,
+ ash::ShelfLaunchSource source) {
+ return ash::kNoAction;
}
ash::ShelfAppMenuItemList ArcAppDeferredLauncherItemController::GetAppMenuItems(
@@ -46,8 +49,3 @@ void ArcAppDeferredLauncherItemController::Close() {
if (host_)
host_->Close(app_id());
}
-
-ash::ShelfItemDelegate::PerformedAction
-ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
- return ash::ShelfItemDelegate::kNoAction;
-}

Powered by Google App Engine
This is Rietveld 408576698