OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/api/guest_view/guest_view_internal_api.h" | 5 #include "chrome/browser/extensions/api/guest_view/guest_view_internal_api.h" |
6 | 6 |
7 #include "chrome/browser/guest_view/guest_view_base.h" | 7 #include "chrome/browser/guest_view/guest_view_base.h" |
8 #include "chrome/browser/guest_view/guest_view_manager.h" | 8 #include "chrome/browser/guest_view/guest_view_manager.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/common/extensions/api/guest_view_internal.h" | 10 #include "chrome/common/extensions/api/guest_view_internal.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 | 27 |
28 GuestViewManager* guest_view_manager = | 28 GuestViewManager* guest_view_manager = |
29 GuestViewManager::FromBrowserContext(browser_context()); | 29 GuestViewManager::FromBrowserContext(browser_context()); |
30 | 30 |
31 GuestViewManager::WebContentsCreatedCallback callback = | 31 GuestViewManager::WebContentsCreatedCallback callback = |
32 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback, | 32 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback, |
33 this); | 33 this); |
34 guest_view_manager->CreateGuest(view_type, | 34 guest_view_manager->CreateGuest(view_type, |
35 extension_id(), | 35 extension_id(), |
36 render_view_host()->GetProcess()->GetID(), | 36 render_view_host()->GetProcess()->GetID(), |
| 37 GetAssociatedWebContents(), |
37 *create_params, | 38 *create_params, |
38 callback); | 39 callback); |
39 | 40 |
40 return true; | 41 return true; |
41 } | 42 } |
42 | 43 |
43 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( | 44 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( |
44 content::WebContents* guest_web_contents) { | 45 content::WebContents* guest_web_contents) { |
45 int guest_instance_id = 0; | 46 int guest_instance_id = 0; |
46 if (guest_web_contents) { | 47 if (guest_web_contents) { |
47 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); | 48 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); |
48 guest_instance_id = guest->GetGuestInstanceID(); | 49 guest_instance_id = guest->GetGuestInstanceID(); |
49 } | 50 } |
50 SetResult(new base::FundamentalValue(guest_instance_id)); | 51 SetResult(new base::FundamentalValue(guest_instance_id)); |
51 SendResponse(true); | 52 SendResponse(true); |
52 } | 53 } |
53 | 54 |
54 } // namespace extensions | 55 } // namespace extensions |
OLD | NEW |