Index: extensions/browser/app_window/app_window_contents.h |
diff --git a/apps/app_window_contents.h b/extensions/browser/app_window/app_window_contents.h |
similarity index 64% |
rename from apps/app_window_contents.h |
rename to extensions/browser/app_window/app_window_contents.h |
index fb3534e86396fd3f1a973efbbfd6780690ffb6ae..2a3d905beca08fcce0d0a56774394f7feaa85d12 100644 |
--- a/apps/app_window_contents.h |
+++ b/extensions/browser/app_window/app_window_contents.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_APP_WINDOW_CONTENTS_H_ |
-#define APPS_APP_WINDOW_CONTENTS_H_ |
+#ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |
+#define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
@@ -18,28 +18,24 @@ class BrowserContext; |
} |
namespace extensions { |
-struct DraggableRegion; |
-} |
-namespace apps { |
+struct DraggableRegion; |
// AppWindowContents class specific to app windows. It maintains a |
// WebContents instance and observes it for the purpose of passing |
// messages to the extensions system. |
-class AppWindowContentsImpl |
- : public extensions::AppWindowContents, |
- public content::WebContentsObserver, |
- public extensions::ExtensionFunctionDispatcher::Delegate { |
+class AppWindowContentsImpl : public AppWindowContents, |
+ public content::WebContentsObserver, |
+ public ExtensionFunctionDispatcher::Delegate { |
public: |
- explicit AppWindowContentsImpl(extensions::AppWindow* host); |
+ explicit AppWindowContentsImpl(AppWindow* host); |
virtual ~AppWindowContentsImpl(); |
// AppWindowContents |
virtual void Initialize(content::BrowserContext* context, |
const GURL& url) OVERRIDE; |
virtual void LoadContents(int32 creator_process_id) OVERRIDE; |
- virtual void NativeWindowChanged( |
- extensions::NativeAppWindow* native_app_window) OVERRIDE; |
+ virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; |
virtual void NativeWindowClosed() OVERRIDE; |
virtual void DispatchWindowShownForTests() const OVERRIDE; |
virtual content::WebContents* GetWebContents() const OVERRIDE; |
@@ -48,25 +44,22 @@ class AppWindowContentsImpl |
// content::WebContentsObserver |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
- // extensions::ExtensionFunctionDispatcher::Delegate |
- virtual extensions::WindowController* GetExtensionWindowController() const |
- OVERRIDE; |
+ // ExtensionFunctionDispatcher::Delegate |
+ virtual WindowController* GetExtensionWindowController() const OVERRIDE; |
virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; |
void OnRequest(const ExtensionHostMsg_Request_Params& params); |
- void UpdateDraggableRegions( |
- const std::vector<extensions::DraggableRegion>& regions); |
+ void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions); |
void SuspendRenderViewHost(content::RenderViewHost* rvh); |
- extensions::AppWindow* host_; // This class is owned by |host_| |
+ AppWindow* host_; // This class is owned by |host_| |
GURL url_; |
scoped_ptr<content::WebContents> web_contents_; |
- scoped_ptr<extensions::ExtensionFunctionDispatcher> |
- extension_function_dispatcher_; |
+ scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_; |
DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl); |
}; |
-} // namespace apps |
+} // namespace extensions |
-#endif // APPS_APP_WINDOW_CONTENTS_H_ |
+#endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |