chrome/installer/util/installation_validator.h - Issue 10823437: Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8

Unified Diff: chrome/installer/util/installation_validator.h

Issue 10823437: Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reimplementing registry changes using AppCommand; adding checks in InstallationValidator. Created 8 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:

View side-by-side diff with in-line comments

Download patch

« chrome/installer/util/app_command.cc ('K') | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_validator.cc » ('j') | chrome/installer/util/installation_validator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/installation_validator.h

diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h

index d06ab9dc5b557bec0501056a2b118d51fa017cf8..9b7e8cc87f960cb78eb844b71d343c576628b5a2 100644

--- a/chrome/installer/util/installation_validator.h

+++ b/chrome/installer/util/installation_validator.h

@@ -196,11 +196,26 @@ class InstallationValidator {

BrowserDistribution* dist;

const ProductState& state;

const ProductRules& rules;

+ ProductContext(const InstallationState& machine_state,

+ const bool system_install,

+ const ProductState& state,

+ const ProductRules& rules):

gab 2012/08/28 16:08:19 See style at http://google-styleguide.googlecode.c

huangs 2012/08/29 17:02:54 Done.

+ machine_state(machine_state),

gab 2012/08/28 16:08:19 I don't know what the style is here, but I don't l

gab 2012/08/28 17:48:09 Discussed with Erik and Greg, suffix all the param

grt (UTC plus 2) 2012/08/28 19:35:40 +1.

huangs 2012/08/29 17:02:54 Done.

+ system_install(system_install),

+ dist(BrowserDistribution::GetSpecificDistribution(

+ rules.distribution_type())),

+ state(state),

+ rules(rules) {

+ }

};

+ static void ValidateOnOsUpgradeCommand(const ProductContext& ctx,

+ const AppCommand& command,

+ bool* is_valid);

static void ValidateInstallAppCommand(const ProductContext& ctx,

- const AppCommand& command,

- bool* is_valid);

+ const AppCommand& command,

+ bool* is_valid);

static void ValidateQuickEnableCfCommand(const ProductContext& ctx,

const AppCommand& command,

bool* is_valid);

@@ -242,10 +257,7 @@ class InstallationValidator {

bool* is_valid);

static void ValidateUsageStats(const ProductContext& ctx,

bool* is_valid);

- static void ValidateProduct(const InstallationState& machine_state,

- bool system_install,

- const ProductState& product_state,

- const ProductRules& rules,

+ static void ValidateProduct(const ProductContext& ctx,

bool* is_valid);

// A collection of all valid installation types.