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

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « chrome/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/setup_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index f288649f33939537e24817d319bd21e9fc615aa8..8bdd55c692be09e778be8c91a01c76bf38409fd8 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -894,7 +894,7 @@
scoped_ptr<WorkItemList> delegate_execute_list(
WorkItem::CreateWorkItemList());
installer::AddDelegateExecuteWorkItems(
- installer_state, chrome_exe.DirName(), base::Version(), chrome,
+ installer_state, chrome_exe.DirName(), Version(), chrome,
delegate_execute_list.get());
delegate_execute_list->Do();
if (ShellUtil::CanMakeChromeDefaultUnattended()) {
@@ -1125,7 +1125,7 @@
BrowserDistribution* browser_dist = product.distribution();
// We started as system-level and have been re-launched as user level
// to continue with the toast experiment.
- base::Version installed_version;
+ Version installed_version;
InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
if (!installed_version.IsValid()) {
LOG(ERROR) << "No installation of "
@@ -1389,8 +1389,9 @@
}
VLOG(1) << "unpacked to " << unpack_path.value();
- base::FilePath src_path(unpack_path.Append(kInstallSourceChromeDir));
- scoped_ptr<base::Version>
+ base::FilePath src_path(
+ unpack_path.Append(kInstallSourceChromeDir));
+ scoped_ptr<Version>
installer_version(GetMaxVersionFromArchiveDir(src_path));
if (!installer_version.get()) {
LOG(ERROR) << "Did not find any valid version in installer.";
« no previous file with comments | « chrome/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/setup_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698