chrome/browser/shell_integration.h - Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation.

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

Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Small comment change. Created 8 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:

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

Download patch

« chrome/browser/extensions/app_host/app_host.rc ('K') | « chrome/browser/extensions/app_host/app_host_resource.h ('k') | chrome/browser/shell_integration_win.cc » ('j') | chrome/installer/setup/install_worker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/shell_integration.h

diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h

index 138c87438e19d9454714ccbb4f23882003b3957b..c88aa6dcf0bc68a186ca7d712e5e2293360d900e 100644

--- a/chrome/browser/shell_integration.h

+++ b/chrome/browser/shell_integration.h

@@ -146,9 +146,9 @@ class ShellIntegration {

// Get the AppUserModelId for the App List, for the profile in |profile_path|.

static string16 GetAppListAppModelIdForProfile(const FilePath& profile_path);

- // Returns the path to the Chromium icon. This is used to specify the icon

- // to use for the taskbar group on Win 7.

- static string16 GetChromiumIconPath();

+ // Returns the string to the Chromium icon, (e.g., "C:\path\to\chrome.exe,0").

+ // This is used to specify the icon to use for the taskbar group on Win 7.

+ static string16 GetChromiumIconString();

// Migrates existing chrome shortcuts by tagging them with correct app id.

// see http://crbug.com/28104