chrome/installer/util/install_util.cc - Issue 6288009: More installer refactoring in the interest of fixing some bugs and cleaning t...

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/util/install_util.cc

Issue 6288009: More installer refactoring in the interest of fixing some bugs and cleaning t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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/installer/util/chrome_frame_operations.cc ('K') | « chrome/installer/util/install_util.h ('k') | chrome/installer/util/install_util_unittest.cc » ('j') | chrome/installer/util/installation_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/install_util.cc

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

--- chrome/installer/util/install_util.cc (revision 71802)

+++ chrome/installer/util/install_util.cc (working copy)

@@ -12,24 +12,24 @@

#include <algorithm>

+#include "base/command_line.h"

#include "base/file_util.h"

#include "base/logging.h"

#include "base/path_service.h"

#include "base/scoped_ptr.h"

#include "base/string_util.h"

#include "base/values.h"

+#include "base/version.h"

#include "base/win/registry.h"

#include "base/win/windows_version.h"

#include "chrome/common/json_value_serializer.h"

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

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

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

-#include "chrome/installer/util/master_preferences_constants.h"

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

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

using base::win::RegKey;

-using installer::MasterPreferences;

bool InstallUtil::ExecuteExeAsAdmin(const CommandLine& cmd, DWORD* exit_code) {

FilePath::StringType program(cmd.GetProgram().value());