| Index: ash/shell/window_watcher_launcher_item_delegate.h
|
| diff --git a/ash/shell/window_watcher_launcher_item_delegate.h b/ash/shell/window_watcher_launcher_item_delegate.h
|
| index e7d0b22e8a41b414277fd9db35c6e7fbcaf68d85..53014b699584c3ca49754592363bd4799a0ff96b 100644
|
| --- a/ash/shell/window_watcher_launcher_item_delegate.h
|
| +++ b/ash/shell/window_watcher_launcher_item_delegate.h
|
| @@ -25,7 +25,7 @@ class WindowWatcherLauncherItemDelegate : public ash::LauncherItemDelegate {
|
| virtual void ItemSelected(const ui::Event& event) OVERRIDE;
|
| virtual base::string16 GetTitle() OVERRIDE;
|
| virtual ui::MenuModel* CreateContextMenu(
|
| - aura::RootWindow* root_window) OVERRIDE;
|
| + aura::Window* root_window) OVERRIDE;
|
| virtual ash::LauncherMenuModel* CreateApplicationMenu(
|
| int event_flags) OVERRIDE;
|
| virtual bool IsDraggable() OVERRIDE;
|
|
|