chrome/app/close_handle_hook_win.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

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/app/close_handle_hook_win.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase 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:

Index: chrome/app/close_handle_hook_win.cc

diff --git a/chrome/app/close_handle_hook_win.cc b/chrome/app/close_handle_hook_win.cc

index fca2e2f8aa857e6139a543210a2e28b4afd22cc9..44b682c4b8a84ff597d4bd586db2a44782fd8dd5 100644

--- a/chrome/app/close_handle_hook_win.cc

+++ b/chrome/app/close_handle_hook_win.cc

@@ -14,7 +14,8 @@

#include "base/win/iat_patch_function.h"

#include "base/win/pe_image.h"

#include "base/win/scoped_handle.h"

-#include "chrome/common/chrome_version_info.h"

+#include "chrome/common/channel_info.h"

+#include "components/version_info/version_info.h"

namespace {

@@ -184,7 +185,7 @@ bool UseHooks() {

#if defined(ARCH_CPU_X86_64)

return false;

#elif defined(NDEBUG)

- version_info::Channel channel = chrome::VersionInfo::GetChannel();

+ version_info::Channel channel = chrome::GetChannel();

if (channel == version_info::Channel::CANARY ||

channel == version_info::Channel::DEV ||

channel == version_info::Channel::UNKNOWN) {

« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/DEPS » ('j') | no next file with comments »