summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/google_chrome_sxs_distribution.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 17:38:54 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 17:38:54 +0000
commitaa5879a5ff18f4b14741c9a7b6853ad8368a8772 (patch)
tree485211271754eec1a34b89fe5f0fb370856ae5c6 /chrome/installer/util/google_chrome_sxs_distribution.cc
parent8a3d0caf6592ccdf69583edd8e08f9eff9e916f7 (diff)
downloadchromium_src-aa5879a5ff18f4b14741c9a7b6853ad8368a8772.zip
chromium_src-aa5879a5ff18f4b14741c9a7b6853ad8368a8772.tar.gz
chromium_src-aa5879a5ff18f4b14741c9a7b6853ad8368a8772.tar.bz2
Only do DelegateExecute verb handler registration for Google Chrome.
Don't do it for canary, which can't be made the default browser anyway, or for Chromium, which needs its own handler registration; see the associated bug. BUG=123727 TEST=install SxS Chrome and/or Chromium and confirm that the DelegateExecute handler is not registered (chrome_installer.log should say "No DelegateExecute verb handler processing to do for ...") Review URL: http://codereview.chromium.org/10103020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_sxs_distribution.cc')
-rw-r--r--chrome/installer/util/google_chrome_sxs_distribution.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index 883994d..195ea69 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -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.
//
@@ -62,6 +62,14 @@ bool GoogleChromeSxSDistribution::GetChromeChannel(std::wstring* channel) {
return true;
}
+bool GoogleChromeSxSDistribution::GetDelegateExecuteHandlerData(
+ string16* handler_class_uuid,
+ string16* type_lib_uuid,
+ string16* type_lib_version,
+ string16* interface_uuid) {
+ return false;
+}
+
std::wstring GoogleChromeSxSDistribution::ChannelName() {
return kChannelName;
}