| Index: ash/shelf/app_list_shelf_item_delegate.h
|
| diff --git a/ash/shelf/app_list_shelf_item_delegate.h b/ash/shelf/app_list_shelf_item_delegate.h
|
| index 282759974f8b5eb060d0ae6ed7eca0f6f12807cd..6a14f1442406cd417689bfcaf8f75ab9769190c3 100644
|
| --- a/ash/shelf/app_list_shelf_item_delegate.h
|
| +++ b/ash/shelf/app_list_shelf_item_delegate.h
|
| @@ -23,7 +23,7 @@ class AppListShelfItemDelegate : public 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 LauncherMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
|
| virtual bool IsDraggable() OVERRIDE;
|
| virtual bool ShouldShowTooltip() OVERRIDE;
|
|
|