| 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 55ff4f5a08cac585688cbda65229ce357f295c4d..838446462bd1d20c9a8814edb711892ee71391e1 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/app_window.h"
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.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;
|
| @@ -25,21 +25,21 @@ 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 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;
|
| @@ -67,7 +67,7 @@ class AshPanelContents
|
|
|
| void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
|
|
| - apps::AppWindow* host_;
|
| + extensions::AppWindow* host_;
|
| GURL url_;
|
| scoped_ptr<content::WebContents> web_contents_;
|
| scoped_ptr<extensions::ExtensionFunctionDispatcher>
|
|
|