diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 02:10:36 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 02:10:36 +0000 |
| commit | 2bf9b6d47105b5c8fbcc1d86b7045212c9d06ca6 (patch) | |
| tree | b9b84f4974cc82cf554e1cb6dfb9515d51ab0cc3 /chrome/browser/download | |
| parent | 705e1635e0602c1c40181b2fce4bd5567f883e19 (diff) | |
| download | chromium_src-2bf9b6d47105b5c8fbcc1d86b7045212c9d06ca6.zip chromium_src-2bf9b6d47105b5c8fbcc1d86b7045212c9d06ca6.tar.gz chromium_src-2bf9b6d47105b5c8fbcc1d86b7045212c9d06ca6.tar.bz2 | |
[WebIntents, QuickOffice]
Support dev version of QuickOffice, too.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11226053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/chrome_download_manager_delegate.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index e9e5c4e..960e149f 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -415,12 +415,23 @@ bool ChromeDownloadManagerDelegate::ShouldOpenWithWebIntents( // If QuickOffice extension is installed, use web intents to handle the // downloaded file. - const char* kQuickOfficeExtensionId = "gbkeegbaiigmenfmjfclcdgdpimamgkj"; + const char kQuickOfficeExtensionId[] = "gbkeegbaiigmenfmjfclcdgdpimamgkj"; + const char kQuickOfficeDevExtensionId[] = "ionpfmkccalenbmnddpbmocokhaknphg"; ExtensionServiceInterface* extension_service = profile_->GetExtensionService(); + + bool use_quickoffice = false; if (extension_service && extension_service->GetInstalledExtension(kQuickOfficeExtensionId) && - extension_service->IsExtensionEnabled(kQuickOfficeExtensionId)) { + extension_service->IsExtensionEnabled(kQuickOfficeExtensionId)) + use_quickoffice = true; + + if (extension_service && + extension_service->GetInstalledExtension(kQuickOfficeDevExtensionId) && + extension_service->IsExtensionEnabled(kQuickOfficeDevExtensionId)) + use_quickoffice = true; + + if (use_quickoffice) { if (mime_type == "application/msword" || mime_type == "application/vnd.ms-powerpoint" || mime_type == "application/vnd.ms-excel" || |