| Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| index 15e1ba057731aaf1bc522ccb8b9f60e3f684b8d2..bc2c6d627e3772376e2995a9eb5d7b65e03938dc 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| @@ -37,7 +37,7 @@ bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
|
|
|
| LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
|
| const ash::LauncherItem* item,
|
| - aura::RootWindow* root)
|
| + aura::Window* root)
|
| : ui::SimpleMenuModel(NULL),
|
| controller_(controller),
|
| item_(*item),
|
| @@ -49,7 +49,7 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
|
| }
|
|
|
| LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
|
| - aura::RootWindow* root)
|
| + aura::Window* root)
|
| : ui::SimpleMenuModel(NULL),
|
| controller_(controller),
|
| item_(ash::LauncherItem()),
|
|
|