chrome/installer/setup/install.h - Issue 159618: Use alternate icon for Chrome shortcuts if specified in master preferences.

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/installer/setup/install.h

Issue 159618: Use alternate icon for Chrome shortcuts if specified in master preferences. (Closed)

Patch Set: fix merge errors Created 11 years, 5 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/installer/setup/install.h

diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h

index de468b3d3bdd39fccf26d588782146111d5f3a13..cd77a3a45752c009a2e2147f75edbd8c8125ed11 100644

--- a/chrome/installer/setup/install.h

+++ b/chrome/installer/setup/install.h

@@ -37,8 +37,9 @@ std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path,

// is responsible for cleaning up install_temp_path.

installer_util::InstallStatus InstallOrUpdateChrome(

const std::wstring& exe_path, const std::wstring& archive_path,

- const std::wstring& install_temp_path, const DictionaryValue* prefs,

- const Version& new_version, const Version* installed_version);

+ const std::wstring& install_temp_path, const std::wstring& prefs_path,

+ const DictionaryValue* prefs, const Version& new_version,

+ const Version* installed_version);

// This function installs a new version of Chrome to the specified location.

// It returns true if install was successful and false in case of an error.

« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »