| Index: extensions/shell/common/shell_extensions_client.h
|
| diff --git a/extensions/test/test_extensions_client.h b/extensions/shell/common/shell_extensions_client.h
|
| similarity index 67%
|
| copy from extensions/test/test_extensions_client.h
|
| copy to extensions/shell/common/shell_extensions_client.h
|
| index be2acd79b7b22ef6032294af51769cf6969e006a..d4ab7366f9016daae1d1f3bfe58661b7dc95fed9 100644
|
| --- a/extensions/test/test_extensions_client.h
|
| +++ b/extensions/shell/common/shell_extensions_client.h
|
| @@ -1,24 +1,27 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef EXTENSIONS_TEST_TEST_EXTENSIONS_CLIENT_H_
|
| -#define EXTENSIONS_TEST_TEST_EXTENSIONS_CLIENT_H_
|
| +#ifndef EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
|
| +#define EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
|
|
|
| -#include "base/macros.h"
|
| +#include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "extensions/common/extensions_client.h"
|
| +#include "extensions/common/permissions/extensions_api_permissions.h"
|
|
|
| namespace extensions {
|
|
|
| -class TestExtensionsClient : public ExtensionsClient {
|
| +// The app_shell implementation of ExtensionsClient.
|
| +class ShellExtensionsClient : public ExtensionsClient {
|
| public:
|
| - TestExtensionsClient();
|
| - virtual ~TestExtensionsClient();
|
| + ShellExtensionsClient();
|
| + virtual ~ShellExtensionsClient();
|
|
|
| - private:
|
| + // ExtensionsClient overrides:
|
| virtual void Initialize() OVERRIDE;
|
| - virtual const PermissionMessageProvider& GetPermissionMessageProvider() const
|
| - OVERRIDE;
|
| + virtual const PermissionMessageProvider& GetPermissionMessageProvider()
|
| + const OVERRIDE;
|
| virtual scoped_ptr<FeatureProvider> CreateFeatureProvider(
|
| const std::string& name) const OVERRIDE;
|
| virtual scoped_ptr<JSONFeatureProviderSource> CreateFeatureProviderSource(
|
| @@ -41,15 +44,14 @@ class TestExtensionsClient : public ExtensionsClient {
|
| virtual void RegisterAPISchemaResources(ExtensionAPI* api) const OVERRIDE;
|
| virtual bool ShouldSuppressFatalErrors() const OVERRIDE;
|
|
|
| - // A whitelist of extensions that can script anywhere. Do not add to this
|
| - // list (except in tests) without consulting the Extensions team first.
|
| - // Note: Component extensions have this right implicitly and do not need to be
|
| - // added to this list.
|
| + private:
|
| + const ExtensionsAPIPermissions extensions_api_permissions_;
|
| +
|
| ScriptingWhitelist scripting_whitelist_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TestExtensionsClient);
|
| + DISALLOW_COPY_AND_ASSIGN(ShellExtensionsClient);
|
| };
|
|
|
| } // namespace extensions
|
|
|
| -#endif // EXTENSIONS_TEST_TEST_EXTENSIONS_CLIENT_H_
|
| +#endif // EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
|
|
|