| Index: chrome/browser/extensions/external_pref_loader.h
|
| diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h
|
| index ec64c7391d1ac8a022f7e5f3337952b96b18288c..96e4f5723e365ea3e2640a15c3a63561c37363be 100644
|
| --- a/chrome/browser/extensions/external_pref_loader.h
|
| +++ b/chrome/browser/extensions/external_pref_loader.h
|
| @@ -35,12 +35,12 @@ class ExternalPrefLoader : public ExternalLoader {
|
| // extension files are resolved relative to this path.
|
| ExternalPrefLoader(int base_path_id, Options options);
|
|
|
| - virtual const base::FilePath GetBaseCrxFilePath() override;
|
| + const base::FilePath GetBaseCrxFilePath() override;
|
|
|
| protected:
|
| - virtual ~ExternalPrefLoader() {}
|
| + ~ExternalPrefLoader() override {}
|
|
|
| - virtual void StartLoading() override;
|
| + void StartLoading() override;
|
| bool IsOptionSet(Options option) {
|
| return (options_ & option) != 0;
|
| }
|
| @@ -86,15 +86,15 @@ class ExternalTestingLoader : public ExternalLoader {
|
| ExternalTestingLoader(const std::string& json_data,
|
| const base::FilePath& fake_base_path);
|
|
|
| - virtual const base::FilePath GetBaseCrxFilePath() override;
|
| + const base::FilePath GetBaseCrxFilePath() override;
|
|
|
| protected:
|
| - virtual void StartLoading() override;
|
| + void StartLoading() override;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<ExternalLoader>;
|
|
|
| - virtual ~ExternalTestingLoader();
|
| + ~ExternalTestingLoader() override;
|
|
|
| base::FilePath fake_base_path_;
|
| scoped_ptr<base::DictionaryValue> testing_prefs_;
|
|
|