Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Side by Side Diff: chrome/browser/shell_integration_win.cc

Issue 2792383003: Rename ScopedComPtr::Release() to ScopedComPtr::Reset() (Closed)
Patch Set: Fix New Callers Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/shell_integration_win.h" 5 #include "chrome/browser/shell_integration_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shlwapi.h> 8 #include <shlwapi.h>
9 #include <shobjidl.h> 9 #include <shobjidl.h>
10 #include <propkey.h> // Needs to come after shobjidl.h. 10 #include <propkey.h> // Needs to come after shobjidl.h.
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 // When in doubt, prefer to not update the shortcut. 832 // When in doubt, prefer to not update the shortcut.
833 NOTREACHED(); 833 NOTREACHED();
834 continue; 834 continue;
835 } 835 }
836 if (propvariant.get().vt == VT_BOOL && 836 if (propvariant.get().vt == VT_BOOL &&
837 !!propvariant.get().boolVal) { 837 !!propvariant.get().boolVal) {
838 updated_properties.set_dual_mode(false); 838 updated_properties.set_dual_mode(false);
839 } 839 }
840 } 840 }
841 841
842 persist_file.Release(); 842 persist_file.Reset();
843 shell_link.Release(); 843 shell_link.Reset();
844 844
845 // Update the shortcut if some of its properties need to be updated. 845 // Update the shortcut if some of its properties need to be updated.
846 if (updated_properties.options && 846 if (updated_properties.options &&
847 base::win::CreateOrUpdateShortcutLink( 847 base::win::CreateOrUpdateShortcutLink(
848 shortcut, updated_properties, 848 shortcut, updated_properties,
849 base::win::SHORTCUT_UPDATE_EXISTING)) { 849 base::win::SHORTCUT_UPDATE_EXISTING)) {
850 ++shortcuts_migrated; 850 ++shortcuts_migrated;
851 } 851 }
852 } 852 }
853 return shortcuts_migrated; 853 return shortcuts_migrated;
854 } 854 }
855 855
856 } // namespace win 856 } // namespace win
857 857
858 } // namespace shell_integration 858 } // namespace shell_integration
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698