| 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 149d599721609eb57b9d5fad36bf1061ddfcbeaf..8456a5b10c77e9fc519913702041db3064ab8e37 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| @@ -216,7 +216,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; }
|
|
|