| Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| index 41d146a119e0689cefcfd3bbffe0b03e466451f7..75c33e059649a84114c5fb803205ae04d6640663 100644
|
| --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include <memory>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/base_paths.h"
|
| @@ -187,6 +188,7 @@ class FlashComponentInstallerTraits : public ComponentInstallerTraits {
|
| void GetHash(std::vector<uint8_t>* hash) const override;
|
| std::string GetName() const override;
|
| update_client::InstallerAttributes GetInstallerAttributes() const override;
|
| + std::vector<std::string> GetMimeTypes() const override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FlashComponentInstallerTraits);
|
| };
|
| @@ -260,6 +262,13 @@ update_client::InstallerAttributes
|
| FlashComponentInstallerTraits::GetInstallerAttributes() const {
|
| return update_client::InstallerAttributes();
|
| }
|
| +
|
| +std::vector<std::string> FlashComponentInstallerTraits::GetMimeTypes() const {
|
| + std::vector<std::string> mime_types;
|
| + mime_types.push_back("application/x-shockwave-flash");
|
| + mime_types.push_back("application/futuresplash");
|
| + return mime_types;
|
| +}
|
| #endif // defined(GOOGLE_CHROME_BUILD)
|
|
|
| } // namespace
|
|
|