chrome_frame/chrome_tab.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_frame/chrome_tab.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_frame/chrome_launcher_utils.cc ('k') | chrome_frame/delete_chrome_history.cc » ('j') | sandbox/src/policy_target_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome_frame/chrome_tab.cc

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

--- chrome_frame/chrome_tab.cc (revision 62510)

+++ chrome_frame/chrome_tab.cc (working copy)

@@ -22,7 +22,7 @@

#include "base/string_piece.h"

#include "base/string_util.h"

#include "base/sys_string_conversions.h"

-#include "base/win_util.h"

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

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/installer/util/google_update_settings.h"

@@ -300,7 +300,7 @@

// The idea here is to try this out on chrome frame dev channel

// and see if it produces a significant drift in startup numbers.

HRESULT SetupRunOnce() {

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

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

return S_OK;

std::wstring channel_name;

@@ -699,7 +699,7 @@

bool RegisterSecuredMimeHandler(bool enable, bool is_system) {

if (!is_system) {

return SetOrDeleteMimeHandlerKey(enable, HKEY_CURRENT_USER);

- } else if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {

+ } else if (base::win::GetVersion() < base::win::VERSION_VISTA) {

return SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);

}