| Index: extensions/browser/guest_view/guest_view_manager.h
|
| diff --git a/extensions/browser/guest_view/guest_view_manager.h b/extensions/browser/guest_view/guest_view_manager.h
|
| index a82aebc035f5c5a99ca2060553edf6b12ef54e12..03581a1cc231ebe0f7c0afa22890ac5a892afee5 100644
|
| --- a/extensions/browser/guest_view/guest_view_manager.h
|
| +++ b/extensions/browser/guest_view/guest_view_manager.h
|
| @@ -57,11 +57,10 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
|
| const base::DictionaryValue& attach_params);
|
|
|
| int GetNextInstanceID();
|
| - int GetGuestInstanceIDForPluginID(
|
| + int GetGuestInstanceIDForElementID(
|
| content::WebContents* embedder_web_contents,
|
| int element_instance_id);
|
|
|
| -
|
| typedef base::Callback<void(content::WebContents*)>
|
| WebContentsCreatedCallback;
|
| void CreateGuest(const std::string& view_type,
|
| @@ -80,10 +79,9 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
|
| const GURL& guest_site);
|
|
|
| // BrowserPluginGuestManager implementation.
|
| - virtual void MaybeGetGuestByInstanceIDOrKill(
|
| + virtual content::WebContents* GetGuestByInstanceID(
|
| content::WebContents* embedder_web_contents,
|
| - int element_instance_id,
|
| - const GuestByInstanceIDCallback& callback) OVERRIDE;
|
| + int element_instance_id) OVERRIDE;
|
| virtual bool ForEachGuest(content::WebContents* embedder_web_contents,
|
| const GuestCallback& callback) OVERRIDE;
|
| protected:
|
|
|