chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h - Issue 2518423003: Combine shelf platform and windowed app types.

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

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)

Patch Set: Fix kInvalidShelfID typo. Created 4 years, 1 month 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/chrome_launcher_controller_impl.h

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

index 44c677510d006fd28ef6247e2f04acd1a982dcfc..5daa8fcc9976aa3d0ffe4007ace5c9696073d76a 100644

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

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

@@ -93,7 +93,6 @@ class ChromeLauncherControllerImpl

extensions::LaunchType GetLaunchType(ash::ShelfID id) override;

void SetLauncherItemImage(ash::ShelfID shelf_id,

const gfx::ImageSkia& image) override;

- bool IsWindowedAppInLauncher(const std::string& app_id) override;

void SetLaunchType(ash::ShelfID id,

extensions::LaunchType launch_type) override;

void UpdateAppState(content::WebContents* contents,