Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / tabs / ash_panel_contents.h

diff --git a/src/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/src/chrome/browser/extensions/api/tabs/ash_panel_contents.h
index 2d0e9f7..8384464 100644 (file)
--- a/src/chrome/browser/extensions/api/tabs/ash_panel_contents.h
+++ b/src/chrome/browser/extensions/api/tabs/ash_panel_contents.h
@@ -7,12 +7,12 @@
 
 #include <vector>
 
-#include "apps/app_window.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/extension_function_dispatcher.h"
 
 class AshPanelWindowController;
 class GURL;
@@ -25,32 +25,34 @@ namespace extensions {
 struct DraggableRegion;
 }
 
-// apps::AppWindowContents class specific to panel windows created by v1
+// extensions::AppWindowContents class specific to panel windows created by v1
 // extenstions. This class maintains a WebContents instance and observes it for
 // the purpose of passing messages to the extensions system. It also creates
 // an extensions::WindowController instance for interfacing with the v1
 // extensions API.
-class AshPanelContents : public apps::AppWindowContents,
-                         public content::WebContentsObserver,
-                         public LauncherFaviconLoader::Delegate,
-                         public ExtensionFunctionDispatcher::Delegate {
+class AshPanelContents
+    : public extensions::AppWindowContents,
+      public content::WebContentsObserver,
+      public LauncherFaviconLoader::Delegate,
+      public extensions::ExtensionFunctionDispatcher::Delegate {
  public:
-  explicit AshPanelContents(apps::AppWindow* host);
+  explicit AshPanelContents(extensions::AppWindow* host);
   virtual ~AshPanelContents();
 
-  // apps::AppWindowContents
+  // extensions::AppWindowContents
   virtual void Initialize(content::BrowserContext* context,
                           const GURL& url) OVERRIDE;
   virtual void LoadContents(int32 creator_process_id) OVERRIDE;
-  virtual void NativeWindowChanged(apps::NativeAppWindow* native_app_window)
-      OVERRIDE;
+  virtual void NativeWindowChanged(
+      extensions::NativeAppWindow* native_app_window) OVERRIDE;
   virtual void NativeWindowClosed() OVERRIDE;
+  virtual void DispatchWindowShownForTests() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
 
   // LauncherFaviconLoader::Delegate overrides:
   virtual void FaviconUpdated() OVERRIDE;
 
-  // ExtensionFunctionDispatcher::Delegate
+  // extensions::ExtensionFunctionDispatcher::Delegate
   virtual extensions::WindowController* GetExtensionWindowController() const
       OVERRIDE;
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
@@ -65,10 +67,11 @@ class AshPanelContents : public apps::AppWindowContents,
 
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
-  apps::AppWindow* host_;
+  extensions::AppWindow* host_;
   GURL url_;
   scoped_ptr<content::WebContents> web_contents_;
-  scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
+  scoped_ptr<extensions::ExtensionFunctionDispatcher>
+      extension_function_dispatcher_;
   scoped_ptr<AshPanelWindowController> window_controller_;
   scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_;