| Index: extensions/shell/browser/shell_app_window.h
|
| diff --git a/apps/shell/browser/shell_app_window.h b/extensions/shell/browser/shell_app_window.h
|
| similarity index 77%
|
| rename from apps/shell/browser/shell_app_window.h
|
| rename to extensions/shell/browser/shell_app_window.h
|
| index 3df66adbd045ec8312739a8cf027d245d6aadbf4..d85f4f00d7e6557e4397a315d8f53e3ced591e4f 100644
|
| --- a/apps/shell/browser/shell_app_window.h
|
| +++ b/extensions/shell/browser/shell_app_window.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_APP_WINDOW_H_
|
| -#define APPS_SHELL_BROWSER_SHELL_APP_WINDOW_H_
|
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_H_
|
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_H_
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -22,21 +22,18 @@ class BrowserContext;
|
| class WebContents;
|
| }
|
|
|
| -namespace extensions {
|
| -class ExtensionFunctionDispatcher;
|
| -}
|
| -
|
| namespace gfx {
|
| class Size;
|
| }
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
| +
|
| +class ExtensionFunctionDispatcher;
|
|
|
| // A simplified app window created by chrome.app.window.create(). Manages the
|
| // primary web contents for the app.
|
| -class ShellAppWindow
|
| - : public content::WebContentsObserver,
|
| - public extensions::ExtensionFunctionDispatcher::Delegate {
|
| +class ShellAppWindow : public content::WebContentsObserver,
|
| + public ExtensionFunctionDispatcher::Delegate {
|
| public:
|
| ShellAppWindow();
|
| virtual ~ShellAppWindow();
|
| @@ -57,7 +54,7 @@ class ShellAppWindow
|
| // content::WebContentsObserver implementation
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| - // extensions::ExtensionFunctionDispatcher::Delegate implementation
|
| + // ExtensionFunctionDispatcher::Delegate implementation
|
| virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
|
|
|
| private:
|
| @@ -65,12 +62,11 @@ class ShellAppWindow
|
| void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
|
|
| scoped_ptr<content::WebContents> web_contents_;
|
| - scoped_ptr<extensions::ExtensionFunctionDispatcher>
|
| - extension_function_dispatcher_;
|
| + scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellAppWindow);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_BROWSER_SHELL_APP_WINDOW_H_
|
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_H_
|
|
|