diff options
14 files changed, 24 insertions, 37 deletions
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 09160a1..10f5c01 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -1255,9 +1255,9 @@ void AddDelegateExecuteWorkItems(const InstallerState& installer_state, const Version& new_version, const Product& product, WorkItemList* list) { - base::string16 handler_class_uuid; BrowserDistribution* dist = product.distribution(); - if (!dist->GetCommandExecuteImplClsid(&handler_class_uuid)) { + const base::string16 handler_class_uuid = dist->GetCommandExecuteImplClsid(); + if (handler_class_uuid.empty()) { if (InstallUtil::IsChromeSxSProcess()) { CleanupBadCanaryDelegateExecuteRegistration(target_path, list); } else { diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index 0c66efb..e9eb6e7 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -257,11 +257,8 @@ bool BrowserDistribution::GetChromeChannel(base::string16* channel) { return false; } -bool BrowserDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - if (handler_class_uuid) - *handler_class_uuid = kCommandExecuteImplUuid; - return true; +base::string16 BrowserDistribution::GetCommandExecuteImplClsid() { + return kCommandExecuteImplUuid; } void BrowserDistribution::UpdateInstallStatus(bool system_install, diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index 003faad..f4b187c 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -140,10 +140,9 @@ class BrowserDistribution { virtual bool GetChromeChannel(base::string16* channel); - // Returns true if this distribution includes a DelegateExecute verb handler, - // and provides the CommandExecuteImpl class UUID if |handler_class_uuid| is - // non-NULL. - virtual bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid); + // Returns the CommandExecuteImpl class UUID (or empty string if this + // distribution doesn't include a DelegateExecute verb handler). + virtual base::string16 GetCommandExecuteImplClsid(); virtual void UpdateInstallStatus(bool system_install, installer::ArchiveType archive_type, diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index 7cc99c8..d5311b3 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -108,9 +108,8 @@ bool ChromeFrameDistribution::CanCreateDesktopShortcuts() { return false; } -bool ChromeFrameDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - return false; +base::string16 ChromeFrameDistribution::GetCommandExecuteImplClsid() { + return base::string16(); } void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h index 276ec0f..a254043 100644 --- a/chrome/installer/util/chrome_frame_distribution.h +++ b/chrome/installer/util/chrome_frame_distribution.h @@ -43,7 +43,7 @@ class ChromeFrameDistribution : public BrowserDistribution { bool CanCreateDesktopShortcuts() override; - bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override; + base::string16 GetCommandExecuteImplClsid() override; void UpdateInstallStatus(bool system_install, installer::ArchiveType archive_type, diff --git a/chrome/installer/util/chromium_binaries_distribution.cc b/chrome/installer/util/chromium_binaries_distribution.cc index 3fa43f4..6db7b81 100644 --- a/chrome/installer/util/chromium_binaries_distribution.cc +++ b/chrome/installer/util/chromium_binaries_distribution.cc @@ -106,7 +106,6 @@ bool ChromiumBinariesDistribution::GetChromeChannel(base::string16* channel) { return false; } -bool ChromiumBinariesDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - return false; +base::string16 ChromiumBinariesDistribution::GetCommandExecuteImplClsid() { + return base::string16(); } diff --git a/chrome/installer/util/chromium_binaries_distribution.h b/chrome/installer/util/chromium_binaries_distribution.h index aa90722..0f75aac 100644 --- a/chrome/installer/util/chromium_binaries_distribution.h +++ b/chrome/installer/util/chromium_binaries_distribution.h @@ -44,7 +44,7 @@ class ChromiumBinariesDistribution : public BrowserDistribution { bool GetChromeChannel(base::string16* channel) override; - bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override; + base::string16 GetCommandExecuteImplClsid() override; protected: friend class BrowserDistribution; diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 3ded7e5..7c0992c 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -236,11 +236,8 @@ base::string16 GoogleChromeDistribution::GetIconFilename() { return installer::kChromeExe; } -bool GoogleChromeDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - if (handler_class_uuid) - *handler_class_uuid = kCommandExecuteImplUuid; - return true; +base::string16 GoogleChromeDistribution::GetCommandExecuteImplClsid() { + return kCommandExecuteImplUuid; } // This method checks if we need to change "ap" key in Google Update to try diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index 9acbff6..c61c90f 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -65,7 +65,7 @@ class GoogleChromeDistribution : public BrowserDistribution { base::string16 GetUninstallRegPath() override; - bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override; + base::string16 GetCommandExecuteImplClsid() override; void UpdateInstallStatus( bool system_install, diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc index 52391b5..a68f675 100644 --- a/chrome/installer/util/google_chrome_distribution_dummy.cc +++ b/chrome/installer/util/google_chrome_distribution_dummy.cc @@ -93,9 +93,8 @@ base::string16 GoogleChromeDistribution::GetIconFilename() { return base::string16(); } -bool GoogleChromeDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - return false; +base::string16 GoogleChromeDistribution::GetCommandExecuteImplClsid() { + return base::string16(); } void GoogleChromeDistribution::UpdateInstallStatus(bool system_install, diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc index a6b23a8..57914f3 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.cc +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc @@ -102,11 +102,8 @@ bool GoogleChromeSxSDistribution::GetChromeChannel(base::string16* channel) { return true; } -bool GoogleChromeSxSDistribution::GetCommandExecuteImplClsid( - base::string16* handler_class_uuid) { - if (handler_class_uuid) - *handler_class_uuid = kCommandExecuteImplUuid; - return true; +base::string16 GoogleChromeSxSDistribution::GetCommandExecuteImplClsid() { + return kCommandExecuteImplUuid; } bool GoogleChromeSxSDistribution::ShouldSetExperimentLabels() { diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h index 9ae8c3a..2c7b73d 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.h +++ b/chrome/installer/util/google_chrome_sxs_distribution.h @@ -31,7 +31,7 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution { base::string16 GetUninstallRegPath() override; DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override; bool GetChromeChannel(base::string16* channel) override; - bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override; + base::string16 GetCommandExecuteImplClsid() override; bool ShouldSetExperimentLabels() override; bool HasUserExperiments() override; // returns the channel name for GoogleChromeSxSDistribution diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 2b8ed14..a753f80 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -336,7 +336,7 @@ class RegistryEntry { app_info.application_description = dist->GetAppDescription(); app_info.publisher_name = dist->GetPublisherName(); - dist->GetCommandExecuteImplClsid(&app_info.delegate_clsid); + app_info.delegate_clsid = dist->GetCommandExecuteImplClsid(); GetProgIdEntries(app_info, entries); diff --git a/win8/delegate_execute/delegate_execute.cc b/win8/delegate_execute/delegate_execute.cc index a41fb5b..01e1fd4 100644 --- a/win8/delegate_execute/delegate_execute.cc +++ b/win8/delegate_execute/delegate_execute.cc @@ -46,10 +46,10 @@ class DelegateExecuteModule HRESULT PreMessageLoop(int nShowCmd) { HRESULT hr = S_OK; - base::string16 clsid_string; GUID clsid; BrowserDistribution* dist = BrowserDistribution::GetDistribution(); - if (!dist->GetCommandExecuteImplClsid(&clsid_string)) + const base::string16 clsid_string = dist->GetCommandExecuteImplClsid(); + if (clsid_string.empty()) return E_FAIL; hr = ::CLSIDFromString(clsid_string.c_str(), &clsid); if (FAILED(hr)) |