summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/uninstall.h
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-21 02:42:56 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-21 02:42:56 +0000
commitf8bd599c36b196cf8a2c342cc090c3ce9892f29e (patch)
tree925826f5c35a229351fa384c3a7953a0814f50bc /chrome/installer/setup/uninstall.h
parent8d7a874ee218f2e33135dd120b7ff7c8d94ed9f6 (diff)
downloadchromium_src-f8bd599c36b196cf8a2c342cc090c3ce9892f29e.zip
chromium_src-f8bd599c36b196cf8a2c342cc090c3ce9892f29e.tar.gz
chromium_src-f8bd599c36b196cf8a2c342cc090c3ce9892f29e.tar.bz2
HKCR/ChromeHTML Win8 registry requirements
This CL also takes care of adding necessary registry entry for DelegateExecute to open Metro mode in Windows 8 (as well as packaging the necessary new files and installing them in the correct places). BUG=119242 TEST=Verify all necessary prog id registry keys are correctly placed on a Win8 install. Verify DelegateExecute binaries, pngs, and VisualElementsManifest.xml land where they belond after running the installer. Review URL: http://codereview.chromium.org/9918012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/uninstall.h')
-rw-r--r--chrome/installer/setup/uninstall.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/installer/setup/uninstall.h b/chrome/installer/setup/uninstall.h
index a531646..a11ec024 100644
--- a/chrome/installer/setup/uninstall.h
+++ b/chrome/installer/setup/uninstall.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.
//
@@ -10,8 +10,7 @@
#include <shlobj.h>
-#include <string>
-
+#include "base/string16.h"
#include "chrome/installer/util/util_constants.h"
class BrowserDistribution;
@@ -29,7 +28,7 @@ class Product;
// |root| is the registry root (HKLM|HKCU) and |browser_entry_suffix| is the
// suffix for default browser entry name in the registry (optional).
bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
- const std::wstring& browser_entry_suffix,
+ const string16& browser_entry_suffix,
const FilePath& target_path,
InstallStatus* exit_code);