Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: extensions/browser/api/guest_view/guest_view_internal_api.cc

Issue 910073003: <webview>: Make contentWindow available prior to attachment (on display:none). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nit Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/browser/guest_sizer.h ('k') | extensions/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 24 matching lines...) Expand all
46 guest_view_manager->CreateGuest(view_type, 47 guest_view_manager->CreateGuest(view_type,
47 sender_web_contents, 48 sender_web_contents,
48 *create_params, 49 *create_params,
49 callback); 50 callback);
50 return true; 51 return true;
51 } 52 }
52 53
53 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( 54 void GuestViewInternalCreateGuestFunction::CreateGuestCallback(
54 content::WebContents* guest_web_contents) { 55 content::WebContents* guest_web_contents) {
55 int guest_instance_id = 0; 56 int guest_instance_id = 0;
57 int content_window_id = MSG_ROUTING_NONE;
56 if (guest_web_contents) { 58 if (guest_web_contents) {
57 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); 59 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);
58 guest_instance_id = guest->guest_instance_id(); 60 guest_instance_id = guest->guest_instance_id();
61 content_window_id = guest->proxy_routing_id();
59 } 62 }
60 SetResult(new base::FundamentalValue(guest_instance_id)); 63 scoped_ptr<base::DictionaryValue> return_params(new base::DictionaryValue());
64 return_params->SetInteger(guestview::kID, guest_instance_id);
65 return_params->SetInteger(guestview::kContentWindowID, content_window_id);
66 SetResult(return_params.release());
61 SendResponse(true); 67 SendResponse(true);
62 } 68 }
63 69
64 GuestViewInternalDestroyGuestFunction:: 70 GuestViewInternalDestroyGuestFunction::
65 GuestViewInternalDestroyGuestFunction() { 71 GuestViewInternalDestroyGuestFunction() {
66 } 72 }
67 73
68 GuestViewInternalDestroyGuestFunction:: 74 GuestViewInternalDestroyGuestFunction::
69 ~GuestViewInternalDestroyGuestFunction() { 75 ~GuestViewInternalDestroyGuestFunction() {
70 } 76 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 set_size_params.normal_size.reset(new gfx::Size( 120 set_size_params.normal_size.reset(new gfx::Size(
115 params->params.normal->width, params->params.normal->height)); 121 params->params.normal->width, params->params.normal->height));
116 } 122 }
117 123
118 guest->SetSize(set_size_params); 124 guest->SetSize(set_size_params);
119 SendResponse(true); 125 SendResponse(true);
120 return true; 126 return true;
121 } 127 }
122 128
123 } // namespace extensions 129 } // namespace extensions
OLDNEW
« no previous file with comments | « content/public/browser/guest_sizer.h ('k') | extensions/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698