From 97d95a83f75cc8f1b9879543f1f9f6ef4f10bb10 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Mon, 23 Jan 2012 20:29:07 +0000 Subject: windows: Fix a few things clang complains about. No functionality change. BUG=82385 TEST=none Review URL: http://codereview.chromium.org/9200009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118725 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/shell_util.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'chrome') diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 3e453f64..68f409e 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -358,7 +358,7 @@ bool IsChromeRegistered(BrowserDistribution* dist, const std::wstring& suffix) { bool registered = true; std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProgIdEntries(dist, chrome_exe, suffix, &entries); RegistryEntry::GetSystemEntries(dist, chrome_exe, suffix, &entries); for (std::list::const_iterator itr = entries.begin(); @@ -377,7 +377,7 @@ bool IsChromeRegisteredForProtocol(BrowserDistribution* dist, const std::wstring& protocol) { bool registered = true; std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol, &entries); for (std::list::const_iterator itr = entries.begin(); itr != entries.end() && registered; ++itr) { @@ -532,7 +532,7 @@ bool ShellUtil::AdminNeededForRegistryCleanup(BrowserDistribution* dist, const std::wstring& suffix) { bool cleanup_needed = false; std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProgIdEntries(dist, L"chrome.exe", suffix, &entries); RegistryEntry::GetSystemEntries(dist, L"chrome.exe", suffix, &entries); for (std::list::const_iterator itr = entries.begin(); @@ -803,7 +803,7 @@ bool ShellUtil::MakeChromeDefault(BrowserDistribution* dist, // this on Vista also. std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); std::wstring suffix; if (!GetUserSpecificDefaultBrowserSuffix(dist, &suffix)) suffix = L""; @@ -866,7 +866,7 @@ bool ShellUtil::MakeChromeDefaultProtocolClient(BrowserDistribution* dist, // Software\Classes\http key directly, we have to do this on Vista also. std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); std::wstring suffix; if (!GetUserSpecificDefaultBrowserSuffix(dist, &suffix)) suffix = L""; @@ -908,7 +908,7 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist, // If user is an admin try to register and return the status. if (IsUserAnAdmin()) { std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProgIdEntries(dist, chrome_exe, suffix, &entries); RegistryEntry::GetSystemEntries(dist, chrome_exe, suffix, &entries); return AddRegistryEntries(HKEY_LOCAL_MACHINE, entries); @@ -923,7 +923,7 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist, // If we got to this point then all we can do is create ProgIds under HKCU // on XP as well as Vista. std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProgIdEntries(dist, chrome_exe, L"", &entries); return AddRegistryEntries(HKEY_CURRENT_USER, entries); } @@ -962,7 +962,7 @@ bool ShellUtil::RegisterChromeForProtocol(BrowserDistribution* dist, // Write in the capabillity for the protocol. std::list entries; - STLElementDeleter> entries_deleter(&entries); + STLElementDeleter > entries_deleter(&entries); RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol, &entries); return AddRegistryEntries(HKEY_LOCAL_MACHINE, entries); -- cgit v1.1