chrome/browser/ui/ash/launcher/launcher_controller_helper.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/launcher_controller_helper.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:

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

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

index cf9b74eeec4e51b7911e2be3156073711d2c2200..0aa0131675a08f485e9cbd8366cef2b5cbbd1ce8 100644

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

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

@@ -8,7 +8,6 @@

#include <memory>

#include <string>

-#include "ash/public/cpp/app_launch_id.h"

#include "ash/public/cpp/shelf_types.h"

#include "base/macros.h"

#include "base/strings/string16.h"

@@ -42,7 +41,7 @@ class LauncherControllerHelper : public ExtensionEnableFlowDelegate {

// Note that already running applications are ignored by the restore process.

virtual bool IsValidIDForCurrentUser(const std::string& id) const;

- void LaunchApp(ash::AppLaunchId id,

+ void LaunchApp(const ash::ShelfID& id,

ash::ShelfLaunchSource source,

int event_flags);