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

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)
Patch Set: nit 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/app_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
index a5c5a55fd192cc7ad28a70d69fd8a4452e0c0cc5..73a1909cd76b49b055b3c0d747c6d0fce420e625 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
@@ -41,10 +41,10 @@ class AppShortcutLauncherItemController : public LauncherItemController {
std::vector<content::WebContents*> GetRunningApplications();
// LauncherItemController overrides:
- ash::ShelfItemDelegate::PerformedAction Activate(
- ash::LaunchSource source) override;
- ash::ShelfItemDelegate::PerformedAction ItemSelected(
- const ui::Event& event) override;
+ ash::ShelfAction ItemSelected(ui::EventType event_type,
+ int event_flags,
+ int64_t display_id,
+ ash::ShelfLaunchSource source) override;
ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
void Close() override;
@@ -77,8 +77,7 @@ class AppShortcutLauncherItemController : public LauncherItemController {
// Activate the browser with the given |content| and show the associated tab.
// Returns the action performed by activating the content.
- ash::ShelfItemDelegate::PerformedAction ActivateContent(
- content::WebContents* content);
+ ash::ShelfAction ActivateContent(content::WebContents* content);
// Advance to the next item if an owned item is already active. The function
// will return true if it has successfully advanced.

Powered by Google App Engine
This is Rietveld 408576698