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 "extensions/browser/api/guest_view/guest_view_internal_api.h" | 5 #include "extensions/browser/api/guest_view/guest_view_internal_api.h" |
6 | 6 |
7 #include "content/public/browser/render_process_host.h" | 7 #include "content/public/browser/render_process_host.h" |
8 #include "content/public/browser/render_view_host.h" | 8 #include "content/public/browser/render_view_host.h" |
9 #include "extensions/browser/guest_view/guest_view_base.h" | 9 #include "extensions/browser/guest_view/guest_view_base.h" |
10 #include "extensions/browser/guest_view/guest_view_manager.h" | 10 #include "extensions/browser/guest_view/guest_view_manager.h" |
11 #include "extensions/common/api/guest_view_internal.h" | 11 #include "extensions/common/api/guest_view_internal.h" |
| 12 #include "extensions/common/guest_view/guest_view_constants.h" |
12 #include "extensions/common/permissions/permissions_data.h" | 13 #include "extensions/common/permissions/permissions_data.h" |
13 | 14 |
14 namespace guest_view_internal = extensions::core_api::guest_view_internal; | 15 namespace guest_view_internal = extensions::core_api::guest_view_internal; |
15 | 16 |
16 namespace extensions { | 17 namespace extensions { |
17 | 18 |
18 GuestViewInternalCreateGuestFunction:: | 19 GuestViewInternalCreateGuestFunction:: |
19 GuestViewInternalCreateGuestFunction() { | 20 GuestViewInternalCreateGuestFunction() { |
20 } | 21 } |
21 | 22 |
(...skipping 20 matching lines...) Expand all Loading... |
42 guest_view_manager->CreateGuest(view_type, | 43 guest_view_manager->CreateGuest(view_type, |
43 sender_web_contents, | 44 sender_web_contents, |
44 *create_params, | 45 *create_params, |
45 callback); | 46 callback); |
46 return true; | 47 return true; |
47 } | 48 } |
48 | 49 |
49 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( | 50 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( |
50 content::WebContents* guest_web_contents) { | 51 content::WebContents* guest_web_contents) { |
51 int guest_instance_id = 0; | 52 int guest_instance_id = 0; |
| 53 int content_window_id = MSG_ROUTING_NONE; |
52 if (guest_web_contents) { | 54 if (guest_web_contents) { |
53 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); | 55 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); |
54 guest_instance_id = guest->guest_instance_id(); | 56 guest_instance_id = guest->guest_instance_id(); |
| 57 content_window_id = guest->proxy_host()->GetGuestProxyRoutingID(); |
55 } | 58 } |
56 SetResult(new base::FundamentalValue(guest_instance_id)); | 59 scoped_ptr<base::DictionaryValue> return_params(new base::DictionaryValue()); |
| 60 return_params->SetInteger(guestview::kID, guest_instance_id); |
| 61 return_params->SetInteger(guestview::kContentWindowID, content_window_id); |
| 62 SetResult(return_params.release()); |
57 SendResponse(true); | 63 SendResponse(true); |
58 } | 64 } |
59 | 65 |
60 GuestViewInternalDestroyGuestFunction:: | 66 GuestViewInternalDestroyGuestFunction:: |
61 GuestViewInternalDestroyGuestFunction() { | 67 GuestViewInternalDestroyGuestFunction() { |
62 } | 68 } |
63 | 69 |
64 GuestViewInternalDestroyGuestFunction:: | 70 GuestViewInternalDestroyGuestFunction:: |
65 ~GuestViewInternalDestroyGuestFunction() { | 71 ~GuestViewInternalDestroyGuestFunction() { |
66 } | 72 } |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 set_size_params.normal_size.reset(new gfx::Size( | 116 set_size_params.normal_size.reset(new gfx::Size( |
111 params->params.normal->width, params->params.normal->height)); | 117 params->params.normal->width, params->params.normal->height)); |
112 } | 118 } |
113 | 119 |
114 guest->SetSize(set_size_params); | 120 guest->SetSize(set_size_params); |
115 SendResponse(true); | 121 SendResponse(true); |
116 return true; | 122 return true; |
117 } | 123 } |
118 | 124 |
119 } // namespace extensions | 125 } // namespace extensions |
OLD | NEW |