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

Unified Diff: chrome_frame/dll_redirector.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 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_frame/dll_redirector.cc
diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc
index 0ca1546edc54d519ece8de5a70c22f9c94b7b13e..2bba924b48aed2155d56e3d634f7c833bfda1122 100644
--- a/chrome_frame/dll_redirector.cc
+++ b/chrome_frame/dll_redirector.cc
@@ -187,9 +187,10 @@ bool DllRedirector::RegisterAsFirstCFModule() {
} else {
char buffer[kSharedMemorySize] = {0};
memcpy(buffer, shared_memory_->memory(), kSharedMemorySize - 1);
- dll_version_.reset(Version::GetVersionFromString(buffer));
+ dll_version_.reset(new Version(buffer));
- if (!dll_version_.get() || dll_version_->Equals(*our_version.get())) {
+ if (!dll_version_->IsValid() ||
+ dll_version_->Equals(*our_version.get())) {
// If we either couldn't parse a valid version out of the shared
// memory or we did parse a version and it is the same as our own,
// then pretend we're first in to avoid trying to load any other DLLs.
@@ -242,14 +243,14 @@ Version* DllRedirector::GetCurrentModuleVersion() {
FileVersionInfo::CreateFileVersionInfoForCurrentModule());
DCHECK(file_version_info.get());
- Version* current_version = NULL;
+ scoped_ptr<Version> current_version;
if (file_version_info.get()) {
- current_version = Version::GetVersionFromString(
- WideToASCII(file_version_info->file_version()));
- DCHECK(current_version);
+ current_version.reset(
+ new Version(WideToASCII(file_version_info->file_version())));
+ DCHECK(current_version->IsValid());
}
- return current_version;
+ return current_version.release();
}
HMODULE DllRedirector::GetFirstModule() {
« no previous file with comments | « chrome/test/mini_installer_test/installer_test_util.cc ('k') | chrome_frame/test/dll_redirector_loading_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698