| Index: components/guest_view/browser/guest_view_base.h
|
| diff --git a/components/guest_view/browser/guest_view_base.h b/components/guest_view/browser/guest_view_base.h
|
| index 9d5b340d2166e0a8e7efccdacbb46ee0d31971ed..745dd7a6a2b554c30be593ca09eb1624bb75e592 100644
|
| --- a/components/guest_view/browser/guest_view_base.h
|
| +++ b/components/guest_view/browser/guest_view_base.h
|
| @@ -8,6 +8,7 @@
|
| #include <queue>
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/values.h"
|
| #include "components/guest_view/common/guest_view_constants.h"
|
| @@ -112,10 +113,10 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| virtual int GetTaskPrefix() const = 0;
|
|
|
| // Dispatches an event to the guest proxy.
|
| - void DispatchEventToGuestProxy(GuestViewEvent* event);
|
| + void DispatchEventToGuestProxy(scoped_ptr<GuestViewEvent> event);
|
|
|
| // Dispatches an event to the view.
|
| - void DispatchEventToView(GuestViewEvent* event);
|
| + void DispatchEventToView(scoped_ptr<GuestViewEvent> event);
|
|
|
| // This creates a WebContents and initializes |this| GuestViewBase to use the
|
| // newly created WebContents.
|
| @@ -431,7 +432,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
|
|
| // This is a queue of Events that are destined to be sent to the embedder once
|
| // the guest is attached to a particular embedder.
|
| - std::deque<linked_ptr<GuestViewEvent> > pending_events_;
|
| + std::deque<scoped_ptr<GuestViewEvent>> pending_events_;
|
|
|
| // The opener guest view.
|
| base::WeakPtr<GuestViewBase> opener_;
|
|
|