| Index: chrome/browser/shell_integration_win.cc
|
| diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
|
| index 6661fcef8312e7d26a207adccc547bdb9818650a..3b6a0ba7c1ba678a7cbe85a1e380e62e9fe3a83c 100644
|
| --- a/chrome/browser/shell_integration_win.cc
|
| +++ b/chrome/browser/shell_integration_win.cc
|
| @@ -784,7 +784,7 @@ int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
|
| base::win::ScopedComPtr<IPersistFile> persist_file;
|
| if (FAILED(shell_link.CreateInstance(CLSID_ShellLink, NULL,
|
| CLSCTX_INPROC_SERVER)) ||
|
| - FAILED(persist_file.QueryFrom(shell_link.Get())) ||
|
| + FAILED(shell_link.CopyTo(persist_file.GetAddressOf())) ||
|
| FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) {
|
| DLOG(WARNING) << "Failed loading shortcut at " << shortcut.value();
|
| continue;
|
| @@ -797,7 +797,7 @@ int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
|
| // Validate the existing app id for the shortcut.
|
| base::win::ScopedComPtr<IPropertyStore> property_store;
|
| propvariant.Reset();
|
| - if (FAILED(property_store.QueryFrom(shell_link.Get())) ||
|
| + if (FAILED(shell_link.CopyTo(property_store.GetAddressOf())) ||
|
| property_store->GetValue(PKEY_AppUserModel_ID, propvariant.Receive()) !=
|
| S_OK) {
|
| // When in doubt, prefer not updating the shortcut.
|
|
|