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

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

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for LauncherTest and observing LauncherModel in DelegateManager Created 7 years, 3 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 8d9ca94fa415062a6c44525bf0052e982b1834cc..c332f1454af7ec8292e9108e9a4d8510a6689f14 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
@@ -33,19 +33,26 @@ class AppShortcutLauncherItemController : public LauncherItemController {
virtual ~AppShortcutLauncherItemController();
+ std::vector<content::WebContents*> GetRunningApplications();
+
// LauncherItemController overrides:
- virtual string16 GetTitle() OVERRIDE;
virtual bool IsCurrentlyShownInWindow(aura::Window* window) const OVERRIDE;
virtual bool IsOpen() const OVERRIDE;
virtual bool IsVisible() const OVERRIDE;
virtual void Launch(int event_flags) OVERRIDE;
virtual void Activate() OVERRIDE;
virtual void Close() OVERRIDE;
- virtual void Clicked(const ui::Event& event) OVERRIDE;
virtual void OnRemoved() OVERRIDE;
virtual ChromeLauncherAppMenuItems GetApplicationList(
int event_flags) OVERRIDE;
- std::vector<content::WebContents*> GetRunningApplications();
+ virtual void ItemSelected(const ui::Event& event) OVERRIDE;
+ virtual base::string16 GetTitle() OVERRIDE;
+ virtual ui::MenuModel* CreateContextMenu(
+ aura::RootWindow* root_window) OVERRIDE;
+ virtual ash::LauncherMenuModel* CreateApplicationMenu(
+ int event_flags) OVERRIDE;
+ virtual bool IsDraggable() OVERRIDE;
+ virtual bool ShouldShowTooltip() OVERRIDE;
// Get the refocus url pattern, which can be used to identify this application
// from a URL link.

Powered by Google App Engine
This is Rietveld 408576698