diff options
Diffstat (limited to 'chrome/browser/extensions/api/tabs/ash_panel_contents.h')
-rw-r--r-- | chrome/browser/extensions/api/tabs/ash_panel_contents.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h index 4f79971..5aa0c46 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h @@ -7,11 +7,11 @@ #include <vector> -#include "apps/shell_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 "chrome/browser/ui/extensions/shell_window.h" #include "content/public/browser/web_contents_observer.h" class AshPanelWindowController; @@ -25,20 +25,20 @@ namespace extensions { struct DraggableRegion; } -// apps::ShellWindowContents class specific to panel windows created by v1 +// ShellWindowContents 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::ShellWindowContents, +class AshPanelContents : public ShellWindowContents, public content::WebContentsObserver, public LauncherFaviconLoader::Delegate, public ExtensionFunctionDispatcher::Delegate { public: - explicit AshPanelContents(apps::ShellWindow* host); + explicit AshPanelContents(ShellWindow* host); virtual ~AshPanelContents(); - // apps::ShellWindowContents + // ShellWindowContents virtual void Initialize(Profile* profile, const GURL& url) OVERRIDE; virtual void LoadContents(int32 creator_process_id) OVERRIDE; virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; @@ -63,7 +63,7 @@ class AshPanelContents : public apps::ShellWindowContents, void OnRequest(const ExtensionHostMsg_Request_Params& params); - apps::ShellWindow* host_; + ShellWindow* host_; GURL url_; scoped_ptr<content::WebContents> web_contents_; scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_; |