chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc - Issue 2716403005: mash: Remove shelf app menu item objects.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)

Patch Set: Address comments. Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

index a5dea34960677a6dafba679933ac1a58587ab0bd..e84941fc5cd74ee6f00ee54bf130b7e18820d8ec 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

@@ -10,7 +10,6 @@

#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"

#include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"

-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"

#include "ui/aura/window.h"

@@ -63,10 +62,11 @@ ash::ShelfAppMenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(

size_t i = std::distance(windows().begin(), it);

gfx::Image image;

aura::Window* window = (*it)->GetNativeWindow();

- items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemV2App>(

+ items.push_back(base::MakeUnique<ash::ShelfApplicationMenuItem>(

+ base::checked_cast<uint32_t>(i),

((window && !window->GetTitle().empty()) ? window->GetTitle()

: app_title),

- &image, app_id(), launcher_controller(), i));

+ &image));

}

return items;

}