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

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

Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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: trunk/src/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
===================================================================
--- trunk/src/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h (revision 226578)
+++ trunk/src/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h (working copy)
@@ -33,25 +33,19 @@
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(ash::LaunchSource source, int event_flags) OVERRIDE;
virtual void Activate(ash::LaunchSource source) OVERRIDE;
virtual void Close() OVERRIDE;
+ virtual void Clicked(const ui::Event& event) OVERRIDE;
+ virtual void OnRemoved() OVERRIDE;
virtual ChromeLauncherAppMenuItems GetApplicationList(
int event_flags) OVERRIDE;
- 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;
+ std::vector<content::WebContents*> GetRunningApplications();
// 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