| Index: chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| index 5aa0c466459e154eb7bb7940ec8af4fca11c51f7..4f799713cc2c8e34b954f6913984e910dfa8abc3 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;
|
| }
|
|
|
| -// ShellWindowContents class specific to panel windows created by v1
|
| +// apps::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 ShellWindowContents,
|
| +class AshPanelContents : public apps::ShellWindowContents,
|
| public content::WebContentsObserver,
|
| public LauncherFaviconLoader::Delegate,
|
| public ExtensionFunctionDispatcher::Delegate {
|
| public:
|
| - explicit AshPanelContents(ShellWindow* host);
|
| + explicit AshPanelContents(apps::ShellWindow* host);
|
| virtual ~AshPanelContents();
|
|
|
| - // ShellWindowContents
|
| + // apps::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 ShellWindowContents,
|
|
|
| void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
|
|
| - ShellWindow* host_;
|
| + apps::ShellWindow* host_;
|
| GURL url_;
|
| scoped_ptr<content::WebContents> web_contents_;
|
| scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
|
|
|