| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| index 3c5ac47bdb012c2c2b29a0311855540f3f4f2ab0..840129fa86c59a116aedb22cbb3d2620a7ec85f1 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| @@ -233,7 +233,7 @@ class TestV2AppLauncherItemController : public LauncherItemController {
|
| return items.Pass();
|
| }
|
| virtual ui::MenuModel* CreateContextMenu(
|
| - aura::RootWindow* root_window) OVERRIDE { return NULL; }
|
| + aura::Window* root_window) OVERRIDE { return NULL; }
|
| virtual ash::LauncherMenuModel* CreateApplicationMenu(
|
| int event_flags) OVERRIDE { return NULL; }
|
| virtual bool IsDraggable() OVERRIDE { return false; }
|
|
|