| Index: extensions/shell/renderer/shell_content_renderer_client.h
|
| diff --git a/apps/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h
|
| similarity index 83%
|
| rename from apps/shell/renderer/shell_content_renderer_client.h
|
| rename to extensions/shell/renderer/shell_content_renderer_client.h
|
| index 9f7aee2e227a9a1a5059e8f9f3f20a0a01c7d640..e7a1fbc5240614dd3255d54b76916b5ecaedf758 100644
|
| --- a/apps/shell/renderer/shell_content_renderer_client.h
|
| +++ b/extensions/shell/renderer/shell_content_renderer_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_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
| -#define APPS_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
| +#ifndef EXTENSIONS_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
| +#define EXTENSIONS_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| @@ -11,12 +11,9 @@
|
| #include "content/public/renderer/content_renderer_client.h"
|
|
|
| namespace extensions {
|
| +
|
| class Dispatcher;
|
| class DispatcherDelegate;
|
| -}
|
| -
|
| -namespace apps {
|
| -
|
| class ShellExtensionsClient;
|
| class ShellExtensionsRendererClient;
|
| class ShellRendererMainDelegate;
|
| @@ -47,12 +44,12 @@ class ShellContentRendererClient : public content::ContentRendererClient {
|
| scoped_ptr<ShellRendererMainDelegate> delegate_;
|
| scoped_ptr<ShellExtensionsClient> extensions_client_;
|
| scoped_ptr<ShellExtensionsRendererClient> extensions_renderer_client_;
|
| - scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_;
|
| - scoped_ptr<extensions::Dispatcher> extension_dispatcher_;
|
| + scoped_ptr<DispatcherDelegate> extension_dispatcher_delegate_;
|
| + scoped_ptr<Dispatcher> extension_dispatcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellContentRendererClient);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
| +#endif // EXTENSIONS_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_
|
|
|