chrome/installer/setup/uninstall.cc - Issue 10909171: Fix and re-commit -- Refactoring and tests for file_util::CreateOrUpdateShortcutLink

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/uninstall.cc

Issue 10909171: Fix and re-commit -- Refactoring and tests for file_util::CreateOrUpdateShortcutLink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Delay load propsys.dll for exes that depend on test_support_base as it doesn't exist on WinXP Created 8 years, 3 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

Index: chrome/installer/setup/uninstall.cc

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc

index 4611a2cef13c2846f023e89b42df5b03e3c64753..209ff786d9f40c42ba3b8f0660fed666e077e168 100644

--- a/chrome/installer/setup/uninstall.cc

+++ b/chrome/installer/setup/uninstall.cc

@@ -19,6 +19,7 @@

#include "base/utf_string_conversions.h"

#include "base/win/registry.h"

#include "base/win/scoped_handle.h"

+#include "base/win/shortcut.h"

#include "base/win/windows_version.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths_internal.h"

@@ -311,7 +312,7 @@ void DeleteChromeShortcuts(const InstallerState& installer_state,

VLOG(1) << "Unpinning shortcut at " << shortcut_link.value()

<< " from taskbar";

// Ignore return value: keep uninstalling if the unpin fails.

- file_util::TaskbarUnpinShortcutLink(shortcut_link.value().c_str());

+ base::win::TaskbarUnpinShortcutLink(shortcut_link.value().c_str());

VLOG(1) << "Deleting shortcut " << shortcut_path.value();

if (!file_util::Delete(shortcut_path, true))

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