| Index: extensions/shell/browser/shell_extensions_browser_client.h
|
| diff --git a/apps/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h
|
| similarity index 83%
|
| rename from apps/shell/browser/shell_extensions_browser_client.h
|
| rename to extensions/shell/browser/shell_extensions_browser_client.h
|
| index b6a20f7fd766e4c38cc5bfd23281c14957bc4aa5..d721f924f76b33e32fa76fa3d7d2a900a8037301 100644
|
| --- a/apps/shell/browser/shell_extensions_browser_client.h
|
| +++ b/extensions/shell/browser/shell_extensions_browser_client.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
| -#define APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| @@ -29,8 +29,8 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE;
|
| virtual bool IsSameContext(content::BrowserContext* first,
|
| content::BrowserContext* second) OVERRIDE;
|
| - virtual bool HasOffTheRecordContext(content::BrowserContext* context)
|
| - OVERRIDE;
|
| + virtual bool HasOffTheRecordContext(
|
| + content::BrowserContext* context) OVERRIDE;
|
| virtual content::BrowserContext* GetOffTheRecordContext(
|
| content::BrowserContext* context) OVERRIDE;
|
| virtual content::BrowserContext* GetOriginalContext(
|
| @@ -40,7 +40,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| const std::string& extension_id,
|
| content::BrowserContext* context) const OVERRIDE;
|
| virtual bool CanExtensionCrossIncognito(
|
| - const extensions::Extension* extension,
|
| + const Extension* extension,
|
| content::BrowserContext* context) const OVERRIDE;
|
| virtual bool IsWebViewRequest(net::URLRequest* request) const OVERRIDE;
|
| virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
|
| @@ -49,11 +49,11 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| const base::FilePath& directory_path,
|
| const std::string& content_security_policy,
|
| bool send_cors_header) OVERRIDE;
|
| - virtual bool AllowCrossRendererResourceLoad(net::URLRequest* request,
|
| - bool is_incognito,
|
| - const Extension* extension,
|
| - InfoMap* extension_info_map)
|
| - OVERRIDE;
|
| + virtual bool AllowCrossRendererResourceLoad(
|
| + net::URLRequest* request,
|
| + bool is_incognito,
|
| + const Extension* extension,
|
| + InfoMap* extension_info_map) OVERRIDE;
|
| virtual PrefService* GetPrefServiceForContext(
|
| content::BrowserContext* context) OVERRIDE;
|
| virtual void GetEarlyExtensionPrefsObservers(
|
| @@ -73,7 +73,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| virtual scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| content::BrowserContext* context) const OVERRIDE;
|
| virtual ComponentExtensionResourceManager*
|
| - GetComponentExtensionResourceManager() OVERRIDE;
|
| + GetComponentExtensionResourceManager() OVERRIDE;
|
|
|
| private:
|
| // The single BrowserContext for app_shell. Not owned.
|
| @@ -90,4 +90,4 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
|
|
|
| } // namespace extensions
|
|
|
| -#endif // APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
|
|
|