diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
| commit | 140905c70becf18808f2ad9d55d6efc00cb96461 (patch) | |
| tree | c8a71d1149012d01bfd91c59740704d164d82b81 /chrome/app | |
| parent | 8f3cf5f5413e223a40fddc111759536df1400893 (diff) | |
| download | chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.zip chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.gz chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.bz2 | |
Update all users of base::Version to explicitly specify the namespace, and clean up the header.
BUG=none
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/100543005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_breakpad_client.cc | 2 | ||||
| -rw-r--r-- | chrome/app/client_util.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/chrome_breakpad_client.cc b/chrome/app/chrome_breakpad_client.cc index 479ff20..65a7ef1 100644 --- a/chrome/app/chrome_breakpad_client.cc +++ b/chrome/app/chrome_breakpad_client.cc @@ -177,7 +177,7 @@ bool ChromeBreakpadClient::AboutToRestart() { bool ChromeBreakpadClient::GetDeferredUploadsSupported( bool is_per_user_install) { - Version update_version = GoogleUpdateSettings::GetGoogleUpdateVersion( + base::Version update_version = GoogleUpdateSettings::GetGoogleUpdateVersion( !is_per_user_install); if (!update_version.IsValid() || update_version.IsOlderThan(std::string(kMinUpdateVersion))) diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 3d5ba1b..ac8734e 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -202,7 +202,7 @@ base::string16 GetCurrentModuleVersion() { FileVersionInfo::CreateFileVersionInfoForCurrentModule()); if (file_version_info.get()) { base::string16 version_string(file_version_info->file_version()); - if (Version(WideToASCII(version_string)).IsValid()) + if (base::Version(WideToASCII(version_string)).IsValid()) return version_string; } return base::string16(); @@ -238,7 +238,7 @@ HMODULE MainDllLoader::Load(base::string16* out_version, // This is used to support Chrome Frame, see http://crbug.com/88589. version_string = cmd_line.GetSwitchValueNative(switches::kChromeVersion); - if (!Version(WideToASCII(version_string)).IsValid()) { + if (!base::Version(WideToASCII(version_string)).IsValid()) { // If a bogus command line flag was given, then abort. LOG(ERROR) << "Invalid command line version: " << version_string; return NULL; |