Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: chrome/browser/component_updater/widevine_cdm_component_installer.cc

Issue 848963002: Fix official Mac build for strict virtual annotations check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index 811321c2a805ebf9d06256a6b7a0c2b5a79f8b40..28b67ab9c37cc8e0d53f44a02cb8709013f08cf2 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -234,23 +234,23 @@ void RegisterWidevineCdmWithChrome(const base::Version& cdm_version,
class WidevineCdmComponentInstallerTraits : public ComponentInstallerTraits {
public:
WidevineCdmComponentInstallerTraits();
- virtual ~WidevineCdmComponentInstallerTraits() {}
+ ~WidevineCdmComponentInstallerTraits() override {}
dcheng 2015/01/13 21:52:51 Note: I left this due to the discussion on https:/
private:
// The following methods override ComponentInstallerTraits.
- virtual bool CanAutoUpdate() const override;
- virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
+ bool CanAutoUpdate() const override;
+ bool OnCustomInstall(const base::DictionaryValue& manifest,
const base::FilePath& install_dir) override;
- virtual bool VerifyInstallation(
+ bool VerifyInstallation(
const base::DictionaryValue& manifest,
const base::FilePath& install_dir) const override;
- virtual void ComponentReady(
+ void ComponentReady(
const base::Version& version,
const base::FilePath& path,
scoped_ptr<base::DictionaryValue> manifest) override;
- virtual base::FilePath GetBaseDirectory() const override;
- virtual void GetHash(std::vector<uint8_t>* hash) const override;
- virtual std::string GetName() const override;
+ base::FilePath GetBaseDirectory() const override;
+ void GetHash(std::vector<uint8_t>* hash) const override;
+ std::string GetName() const override;
// Checks and updates CDM adapter if necessary to make sure the latest CDM
// adapter is always used.
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698