| Index: chrome/browser/extensions/external_policy_loader.h
|
| diff --git a/chrome/browser/extensions/external_policy_extension_loader.h b/chrome/browser/extensions/external_policy_loader.h
|
| similarity index 60%
|
| rename from chrome/browser/extensions/external_policy_extension_loader.h
|
| rename to chrome/browser/extensions/external_policy_loader.h
|
| index b574caaf96d768cc145aa06f3c03c071dc9c4e6d..6ca542600bb897203dd025590cad390a2bf949ea 100644
|
| --- a/chrome/browser/extensions/external_policy_extension_loader.h
|
| +++ b/chrome/browser/extensions/external_policy_loader.h
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_EXTENSION_LOADER_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_EXTENSION_LOADER_H_
|
| +#ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_LOADER_H_
|
| +#define CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_LOADER_H_
|
| #pragma once
|
|
|
| -#include "chrome/browser/extensions/external_extension_loader.h"
|
| +#include "chrome/browser/extensions/external_loader.h"
|
|
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/prefs/pref_change_registrar.h"
|
| @@ -15,14 +15,16 @@
|
|
|
| class Profile;
|
|
|
| -// A specialization of the ExternalExtensionProvider that uses
|
| +namespace extensions {
|
| +
|
| +// A specialization of the ExternalProvider that uses
|
| // prefs::kExtensionInstallForceList to look up which external extensions are
|
| // registered.
|
| -class ExternalPolicyExtensionLoader
|
| - : public ExternalExtensionLoader,
|
| +class ExternalPolicyLoader
|
| + : public ExternalLoader,
|
| public content::NotificationObserver {
|
| public:
|
| - explicit ExternalPolicyExtensionLoader(Profile* profile);
|
| + explicit ExternalPolicyLoader(Profile* profile);
|
|
|
| // content::NotificationObserver implementation
|
| virtual void Observe(int type,
|
| @@ -33,16 +35,18 @@ class ExternalPolicyExtensionLoader
|
| virtual void StartLoading() OVERRIDE;
|
|
|
| private:
|
| - friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
|
| + friend class base::RefCountedThreadSafe<ExternalLoader>;
|
|
|
| - virtual ~ExternalPolicyExtensionLoader() {}
|
| + virtual ~ExternalPolicyLoader() {}
|
|
|
| PrefChangeRegistrar pref_change_registrar_;
|
| content::NotificationRegistrar notification_registrar_;
|
|
|
| Profile* profile_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ExternalPolicyExtensionLoader);
|
| + DISALLOW_COPY_AND_ASSIGN(ExternalPolicyLoader);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_EXTENSION_LOADER_H_
|
| +} // namespace extensions
|
| +
|
| +#endif // CHROME_BROWSER_EXTENSIONS_EXTERNAL_POLICY_LOADER_H_
|
|
|