chrome/installer/setup/install_worker.cc - Issue 7600021: Fix DCHECK in GCF quick-enable.

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/install_worker.cc

Issue 7600021: Fix DCHECK in GCF quick-enable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 9 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/installer/setup/install_worker.cc

diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc

index 60c01277907912d9d7b6b7d6b41ec6d3dada9d60..7164d5032219a4ce284d8ddacfc94e5e2959f836 100644

--- a/chrome/installer/setup/install_worker.cc

+++ b/chrome/installer/setup/install_worker.cc

@@ -692,7 +692,7 @@ void AddInstallWorkItems(const InstallationState& original_state,

install_list->AddDeleteTreeWorkItem(new_chrome_exe, temp_path);

- if (installer_state.is_chrome_frame_running()) {

+ if (installer_state.IsChromeFrameRunning(original_state)) {

VLOG(1) << "Chrome Frame in use. Copying to new_chrome.exe";

install_list->AddCopyTreeWorkItem(

src_path.Append(installer::kChromeExe).value(),

« no previous file with comments | « no previous file | chrome/installer/util/installer_state.h » ('j') | no next file with comments »