chrome/installer/setup/setup_main.cc - Issue 3823002: Move windows version-related stuff out of base/win_util and into base/win/win...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3823002: Move windows version-related stuff out of base/win_util and into base/win/win... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 2 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

« chrome/browser/renderer_host/render_widget_host_view_win.cc ('K') | « chrome/common/sandbox_policy.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | sandbox/src/policy_target_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/setup/setup_main.cc

===================================================================

--- chrome/installer/setup/setup_main.cc (revision 62510)

+++ chrome/installer/setup/setup_main.cc (working copy)

@@ -20,7 +20,7 @@

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

-#include "base/win_util.h"

+#include "base/win/windows_version.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/installer/setup/install.h"

#include "chrome/installer/setup/setup_constants.h"

@@ -674,7 +674,7 @@

return exit_code;

if (system_install && !IsUserAnAdmin()) {

- if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&

+ if (base::win::GetVersion() >= base::win::VERSION_VISTA &&

!parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {

std::wstring exe = parsed_command_line.program();

std::wstring params(command_line);