chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h - Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/shell_window_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

« ash/shell/launcher_item_delegate_impl.h ('K') | « chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h

diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h

index 2ded3422aaa5fcefc7b418b3bcadc93b28db7bd8..3a67d6cf59bd9a2e4b2ffe5d625cde285cc7b729 100644

--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h

+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h

@@ -54,18 +54,24 @@ class ShellWindowLauncherItemController : public LauncherItemController,

const std::string& app_launcher_id() const { return app_launcher_id_; }

- // LauncherItemController

- virtual string16 GetTitle() OVERRIDE;

+ // LauncherItemController overrides:

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;

+ virtual void ItemSelected(const ui::Event& eent) 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;

// aura::WindowObserver

virtual void OnWindowPropertyChanged(aura::Window* window,