Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / panels / panel_host.h

diff --git a/src/chrome/browser/ui/panels/panel_host.h b/src/chrome/browser/ui/panels/panel_host.h
index d383f63..3277c3b 100644 (file)
--- a/src/chrome/browser/ui/panels/panel_host.h
+++ b/src/chrome/browser/ui/panels/panel_host.h
@@ -35,7 +35,7 @@ class Rect;
 // delegates. Owned and used by Panel only.
 class PanelHost : public content::WebContentsDelegate,
                   public content::WebContentsObserver,
-                  public ExtensionFunctionDispatcher::Delegate {
+                  public extensions::ExtensionFunctionDispatcher::Delegate {
  public:
   PanelHost(Panel* panel, Profile* profile);
   virtual ~PanelHost();
@@ -80,11 +80,10 @@ class PanelHost : public content::WebContentsDelegate,
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
-  virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE;
+  virtual void WebContentsDestroyed() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  // ExtensionFunctionDispatcher::Delegate overrides.
+  // extensions::ExtensionFunctionDispatcher::Delegate overrides.
   virtual extensions::WindowController* GetExtensionWindowController() const
       OVERRIDE;
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
@@ -104,7 +103,7 @@ class PanelHost : public content::WebContentsDelegate,
 
   Panel* panel_;  // Weak, owns us.
   Profile* profile_;
-  ExtensionFunctionDispatcher extension_function_dispatcher_;
+  extensions::ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   scoped_ptr<content::WebContents> web_contents_;