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

Side by Side Diff: chrome_frame/utils.cc

Issue 10910257: Fixing missed deallocation of pointer from FileVersionInfo::CreateFileVersionInfoForCurrentModule(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chmod 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_frame/utils.h" 5 #include "chrome_frame/utils.h"
6 6
7 #include <atlsafe.h> 7 #include <atlsafe.h>
8 #include <atlsecurity.h> 8 #include <atlsecurity.h>
9 #include <htiframe.h> 9 #include <htiframe.h>
10 #include <mshtml.h> 10 #include <mshtml.h>
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 content_value->assign(attribute.Copy()); 288 content_value->assign(attribute.Copy());
289 return S_OK; 289 return S_OK;
290 } 290 }
291 291
292 return E_FAIL; 292 return E_FAIL;
293 } 293 }
294 294
295 void DisplayVersionMismatchWarning(HWND parent, 295 void DisplayVersionMismatchWarning(HWND parent,
296 const std::string& server_version) { 296 const std::string& server_version) {
297 // Obtain the current module version. 297 // Obtain the current module version.
298 FileVersionInfo* file_version_info = 298 scoped_ptr<FileVersionInfo> module_version_info(
299 FileVersionInfo::CreateFileVersionInfoForCurrentModule(); 299 FileVersionInfo::CreateFileVersionInfoForCurrentModule());
300 DCHECK(file_version_info); 300 string16 version_string(module_version_info->file_version());
301 std::wstring version_string(file_version_info->file_version());
302 std::wstring wide_server_version; 301 std::wstring wide_server_version;
303 if (server_version.empty()) { 302 if (server_version.empty()) {
304 wide_server_version = SimpleResourceLoader::Get(IDS_VERSIONUNKNOWN); 303 wide_server_version = SimpleResourceLoader::Get(IDS_VERSIONUNKNOWN);
305 } else { 304 } else {
306 wide_server_version = ASCIIToWide(server_version); 305 wide_server_version = ASCIIToWide(server_version);
307 } 306 }
308 std::wstring title = SimpleResourceLoader::Get(IDS_VERSIONMISMATCH_HEADER); 307 std::wstring title = SimpleResourceLoader::Get(IDS_VERSIONMISMATCH_HEADER);
309 std::wstring message; 308 std::wstring message;
310 base::SStringPrintf(&message, 309 base::SStringPrintf(&message,
311 SimpleResourceLoader::Get(IDS_VERSIONMISMATCH).c_str(), 310 SimpleResourceLoader::Get(IDS_VERSIONMISMATCH).c_str(),
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 wininet_connection_count_updated = true; 1670 wininet_connection_count_updated = true;
1672 return true; 1671 return true;
1673 } 1672 }
1674 1673
1675 void GetChromeFrameProfilePath(const string16& profile_name, 1674 void GetChromeFrameProfilePath(const string16& profile_name,
1676 FilePath* profile_path) { 1675 FilePath* profile_path) {
1677 chrome::GetChromeFrameUserDataDirectory(profile_path); 1676 chrome::GetChromeFrameUserDataDirectory(profile_path);
1678 *profile_path = profile_path->Append(profile_name); 1677 *profile_path = profile_path->Append(profile_name);
1679 DVLOG(1) << __FUNCTION__ << ": " << profile_path->value(); 1678 DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
1680 } 1679 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698