| Index: chrome/installer/util/browser_distribution.cc
|
| diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
|
| index 8a249272c802c84b96462548f3bf4ed1c7956b8a..5f186829ceab1040a0ba8272130ec374d06a026a 100644
|
| --- a/chrome/installer/util/browser_distribution.cc
|
| +++ b/chrome/installer/util/browser_distribution.cc
|
| @@ -36,7 +36,7 @@ namespace {
|
| const wchar_t kChromiumActiveSetupGuid[] =
|
| L"{7D2B3E1D-D096-4594-9D8F-A6667F12E0AC}";
|
|
|
| -const wchar_t kCommandExecuteImplUuid[] =
|
| +const wchar_t kCommandExecuteImplUuidString[] =
|
| L"{A2DF06F9-A21A-44A8-8A99-8B9C84F29160}";
|
|
|
| // The Chromium App Launcher icon is index 1; see chrome_exe.rc.
|
| @@ -199,6 +199,18 @@ string16 BrowserDistribution::GetBaseAppId() {
|
| return L"Chromium";
|
| }
|
|
|
| +string16 BrowserDistribution::GetBrowserProgIdPrefix() {
|
| + // This used to be "ChromiumHTML", but was forced to become "ChromiumHTM"
|
| + // because of http://crbug.com/153349. See the declaration of this function
|
| + // in the header file for more details.
|
| + return L"ChromiumHTM";
|
| +}
|
| +
|
| +string16 BrowserDistribution::GetBrowserProgIdDesc() {
|
| + return L"Chromium HTML Document";
|
| +}
|
| +
|
| +
|
| string16 BrowserDistribution::GetInstallSubDir() {
|
| return L"Chromium";
|
| }
|
| @@ -257,6 +269,9 @@ bool BrowserDistribution::CanSetAsDefault() {
|
| return true;
|
| }
|
|
|
| +void BrowserDistribution::DebugEnableSetAsDefault() {
|
| +}
|
| +
|
| bool BrowserDistribution::CanCreateDesktopShortcuts() {
|
| return true;
|
| }
|
| @@ -265,10 +280,10 @@ bool BrowserDistribution::GetChromeChannel(string16* channel) {
|
| return false;
|
| }
|
|
|
| -bool BrowserDistribution::GetCommandExecuteImplClsid(
|
| +bool BrowserDistribution::GetCommandExecuteImplClsidString(
|
| string16* handler_class_uuid) {
|
| if (handler_class_uuid)
|
| - *handler_class_uuid = kCommandExecuteImplUuid;
|
| + *handler_class_uuid = kCommandExecuteImplUuidString;
|
| return true;
|
| }
|
|
|
|
|