Delete both regular and Metro user data dirs on uninstall.

Also:
- The uninstall survey will use the metro Chrome local state if there is no desktop Chrome local state (although in the future we maybe want to aggregate them).
- Chrome inactivity for toast purposes is now based on the most-recently used of both desktop and metro Chrome.

BUG=125793
TEST=install chrome, make it the default, launch into metro at least once, quit, then uninstall and check the "also clear..." box.  Metro data dir should be gone.

Review URL: https://chromiumcodereview.appspot.com/10826144

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149968 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 6 deletions

diff --git a/chrome/installer/util/helper.h b/chrome/installer/util/helper.h
index 71069b1..e588be1 100644
--- a/chrome/installer/util/helper.h
+++ b/chrome/installer/util/helper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -8,6 +8,7 @@
 #define CHROME_INSTALLER_UTIL_HELPER_H_
 
 #include <string>
+#include <vector>
 
 class BrowserDistribution;
 class FilePath;
@@ -21,11 +22,16 @@ namespace installer {
 //                 location (Document And Settings\<user>\Local Settings...)
 FilePath GetChromeInstallPath(bool system_install, BrowserDistribution* dist);
 
-// This function returns the path to the directory that holds the user data,
-// this is always inside "Document And Settings\<user>\Local Settings.". Note
-// that this is the default user data directory and does not take into account
-// that it can be overriden with a command line parameter.
-FilePath GetChromeUserDataPath(BrowserDistribution* dist);
+// Returns the path(s) to the directory that holds the user data (primary and,
+// if applicable to |dist|, alternate).  This is always inside a user's local
+// application data folder (e.g., "AppData\Local or "Local Settings\Application
+// Data" in %USERPROFILE%). Note that these are the defaults and do not take
+// into account that they can be overriden with a command line parameter.
+// |paths| may be empty on return, but is guaranteed not to contain empty paths
+// otherwise. If more than one path is returned, they are guaranteed to be
+// siblings.
+void GetChromeUserDataPaths(BrowserDistribution* dist,
+                            std::vector<FilePath>* paths);
 
 // Returns the distribution corresponding to the current process's binaries.
 // In the case of a multi-install product, this will be the CHROME_BINARIES