| 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 ea2226cfaa1aaa23731a0dde4bb5ec2947a444e6..2ffc77db95c2d427238b33546fee2acb36ef3fdd 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
|
| @@ -66,7 +66,7 @@ class ShellWindowLauncherItemController : public LauncherItemController,
|
| virtual void ItemSelected(const ui::Event& eent) 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;
|
|
|