| Index: extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
|
| diff --git a/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h b/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
|
| index 1b47820cf7d70fbf957823c0a5427fa4c4163b55..8a2d649cf732929d016e27dc41139a34b4c71397 100644
|
| --- a/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
|
| +++ b/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
|
| @@ -5,23 +5,18 @@
|
| #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_EXTENSIONS_GUEST_VIEW_MANAGER_DELEGATE_H_
|
| #define EXTENSIONS_BROWSER_GUEST_VIEW_EXTENSIONS_GUEST_VIEW_MANAGER_DELEGATE_H_
|
|
|
| -#include "extensions/browser/guest_view/guest_view_manager_delegate.h"
|
| +#include "components/guest_view/browser/guest_view_manager_delegate.h"
|
|
|
| namespace content {
|
| class BrowserContext;
|
| } // namespace content
|
|
|
| namespace extensions {
|
| -class GuestViewBase;
|
| -class GuestViewManager;
|
| -} // namespace extensions
|
| -
|
| -namespace extensions {
|
|
|
| // ExtensionsGuestViewManagerDelegate implements GuestViewManager functionality
|
| // specific to Chromium builds that include the extensions module.
|
| class ExtensionsGuestViewManagerDelegate
|
| - : public guestview::GuestViewManagerDelegate {
|
| + : public guest_view::GuestViewManagerDelegate {
|
| public:
|
| explicit ExtensionsGuestViewManagerDelegate(content::BrowserContext* context);
|
| ~ExtensionsGuestViewManagerDelegate() override;
|
| @@ -29,10 +24,10 @@ class ExtensionsGuestViewManagerDelegate
|
| // GuestViewManagerDelegate implementation.
|
| void DispatchEvent(const std::string& event_name,
|
| scoped_ptr<base::DictionaryValue> args,
|
| - GuestViewBase* guest,
|
| + guest_view::GuestViewBase* guest,
|
| int instance_id) override;
|
| - bool IsGuestAvailableToContext(extensions::GuestViewBase* guest) override;
|
| - bool IsOwnedByExtension(extensions::GuestViewBase* guest) override;
|
| + bool IsGuestAvailableToContext(guest_view::GuestViewBase* guest) override;
|
| + bool IsOwnedByExtension(guest_view::GuestViewBase* guest) override;
|
| void RegisterAdditionalGuestViewTypes() override;
|
|
|
| private:
|
|
|