chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h - Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings.

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/app_shortcut_launcher_item_controller.h

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)

Patch Set: Fix struct traits typo. Created 3 years, 7 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/chrome_launcher_prefs.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

index 394bcb98e63fa946b70e49b359ea229873223f0f..9e14ec00082f261646221abbe8fa7405ab25b2f6 100644

--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

@@ -32,7 +32,7 @@ class AppShortcutLauncherItemController : public ash::ShelfItemDelegate {

~AppShortcutLauncherItemController() override;

static std::unique_ptr<AppShortcutLauncherItemController> Create(

- const ash::AppLaunchId& app_launch_id);

+ const ash::ShelfID& shelf_id);

std::vector<content::WebContents*> GetRunningApplications();

@@ -52,8 +52,7 @@ class AppShortcutLauncherItemController : public ash::ShelfItemDelegate {

void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; }

protected:

- explicit AppShortcutLauncherItemController(

- const ash::AppLaunchId& app_launch_id);

+ explicit AppShortcutLauncherItemController(const ash::ShelfID& shelf_id);

private:

// Get the last running application.