| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| index 286708b996a42bda35819be067d1d496c9dd7119..e51e737c3f95dbfa094af909b744ddaf9b15db09 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| @@ -181,11 +181,11 @@ void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -ChromeLauncherAppMenuItems ChromeLauncherControllerMus::GetApplicationList(
|
| +ash::ShelfAppMenuItemList ChromeLauncherControllerMus::GetAppMenuItems(
|
| const ash::ShelfItem& item,
|
| int event_flags) {
|
| NOTIMPLEMENTED();
|
| - return ChromeLauncherAppMenuItems();
|
| + return ash::ShelfAppMenuItemList();
|
| }
|
|
|
| std::vector<content::WebContents*>
|
|
|