Chromium Code Reviews| 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..ac8fa4045b8afe2f38cb9ae6253c6e450f82bdc3 100644 |
| --- a/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h |
| +++ b/extensions/browser/guest_view/extensions_guest_view_manager_delegate.h |
| @@ -5,18 +5,13 @@ |
| #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. |
| @@ -27,12 +22,12 @@ class ExtensionsGuestViewManagerDelegate |
| ~ExtensionsGuestViewManagerDelegate() override; |
| // GuestViewManagerDelegate implementation. |
| - void DispatchEvent(const std::string& event_name, |
| + bool DispatchEvent(const std::string& event_name, |
|
lazyboy
2015/04/30 19:31:07
Are we using the returned value in this CL? (I did
Fady Samuel
2015/04/30 23:26:04
Done.
|
| scoped_ptr<base::DictionaryValue> args, |
| - GuestViewBase* guest, |
| + guestview::GuestViewBase* guest, |
| int instance_id) override; |
| - bool IsGuestAvailableToContext(extensions::GuestViewBase* guest) override; |
| - bool IsOwnedByExtension(extensions::GuestViewBase* guest) override; |
| + bool IsGuestAvailableToContext(guestview::GuestViewBase* guest) override; |
| + bool IsOwnedByExtension(guestview::GuestViewBase* guest) override; |
| void RegisterAdditionalGuestViewTypes() override; |
| private: |