| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
|
| index 8a6df02ff2931e1ce99a0c3de251115f056cbc22..e53f292ed2a6ffdd62b5433087ec29caab8c2b18 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
|
| @@ -48,8 +48,6 @@
|
| #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
|
| #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
|
| #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
|
| #include "chrome/browser/ui/ash/launcher/launcher_arc_app_updater.h"
|
| #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
|
| @@ -617,11 +615,11 @@ void ChromeLauncherControllerImpl::AdditionalUserAddedToSession(
|
| controller->AdditionalUserAddedToSession(profile);
|
| }
|
|
|
| -ash::ShelfAppMenuItemList ChromeLauncherControllerImpl::GetAppMenuItems(
|
| - const ash::ShelfItem& item,
|
| - int event_flags) {
|
| +ash::ShelfAppMenuItemList
|
| +ChromeLauncherControllerImpl::GetAppMenuItemsForTesting(
|
| + const ash::ShelfItem& item) {
|
| LauncherItemController* controller = GetLauncherItemController(item.id);
|
| - return controller ? controller->GetAppMenuItems(event_flags)
|
| + return controller ? controller->GetAppMenuItems(ui::EF_NONE)
|
| : ash::ShelfAppMenuItemList();
|
| }
|
|
|
|
|