| Index: extensions/browser/guest_view/app_view/app_view_guest.h
|
| diff --git a/chrome/browser/guest_view/app_view/app_view_guest.h b/extensions/browser/guest_view/app_view/app_view_guest.h
|
| similarity index 86%
|
| rename from chrome/browser/guest_view/app_view/app_view_guest.h
|
| rename to extensions/browser/guest_view/app_view/app_view_guest.h
|
| index ef490814e8f4ff5b03402f6acfefa055eed27a04..155cbbe19982ebd065bade8226e24554e19d8fc0 100644
|
| --- a/chrome/browser/guest_view/app_view/app_view_guest.h
|
| +++ b/extensions/browser/guest_view/app_view/app_view_guest.h
|
| @@ -2,11 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
| -#define CHROME_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
| +#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
| +#define EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
|
|
| #include "base/id_map.h"
|
| #include "extensions/browser/extension_function_dispatcher.h"
|
| +#include "extensions/browser/guest_view/app_view/app_view_guest_delegate.h"
|
| #include "extensions/browser/guest_view/guest_view.h"
|
|
|
| namespace extensions {
|
| @@ -55,7 +56,8 @@ class AppViewGuest : public GuestView<AppViewGuest>,
|
| virtual void DidInitialize() OVERRIDE;
|
|
|
| private:
|
| - AppViewGuest(content::BrowserContext* browser_context,
|
| + AppViewGuest(AppViewGuestDelegate* app_view_guest_delegate,
|
| + content::BrowserContext* browser_context,
|
| int guest_instance_id);
|
|
|
| virtual ~AppViewGuest();
|
| @@ -73,6 +75,7 @@ class AppViewGuest : public GuestView<AppViewGuest>,
|
| GURL url_;
|
| std::string guest_extension_id_;
|
| scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
|
| + scoped_ptr<AppViewGuestDelegate> app_view_guest_delegate_;
|
|
|
| // This is used to ensure pending tasks will not fire after this object is
|
| // destroyed.
|
| @@ -83,4 +86,4 @@ class AppViewGuest : public GuestView<AppViewGuest>,
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
| +#endif // EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_
|
|
|