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

Unified Diff: chrome/installer/util/google_update_util.cc

Issue 2078913005: Add a chrome_elf_unittest ChromeElfLoadSanityTest which validates that loading chrome_elf does not … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove braces Created 4 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
« no previous file with comments | « base/message_loop/message_pump_win.cc ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_update_util.cc
diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 3a8558f56b0d2e66268f83c409501b8d05f8428b..0e69b414c802661788ca645b9a3e178da7a059fc 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc
@@ -16,7 +16,6 @@
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
-#include "base/win/windows_version.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/google_update_constants.h"
#include "chrome/installer/util/google_update_settings.h"
@@ -178,12 +177,10 @@ void ElevateIfNeededToReenableUpdates() {
base::LaunchOptions launch_options;
launch_options.force_breakaway_from_job_ = true;
- if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
- base::win::UserAccountControlIsEnabled()) {
+ if (base::win::UserAccountControlIsEnabled())
base::LaunchElevatedProcess(cmd, launch_options);
- } else {
+ else
base::LaunchProcess(cmd, launch_options);
- }
}
} // namespace google_update
« no previous file with comments | « base/message_loop/message_pump_win.cc ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698