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

Side by Side Diff: chrome/browser/guest_view/guest_view_base.cc

Issue 258373002: Towards moving guest management to chrome: Introduce GuestViewManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 6 years, 7 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
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 "chrome/browser/guest_view/guest_view_base.h" 5 #include "chrome/browser/guest_view/guest_view_base.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "chrome/browser/guest_view/ad_view/ad_view_guest.h" 8 #include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
9 #include "chrome/browser/guest_view/guest_view_constants.h" 9 #include "chrome/browser/guest_view/guest_view_constants.h"
10 #include "chrome/browser/guest_view/web_view/web_view_guest.h" 10 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 38
39 GuestViewBase::Event::~Event() { 39 GuestViewBase::Event::~Event() {
40 } 40 }
41 41
42 scoped_ptr<base::DictionaryValue> GuestViewBase::Event::GetArguments() { 42 scoped_ptr<base::DictionaryValue> GuestViewBase::Event::GetArguments() {
43 return args_.Pass(); 43 return args_.Pass();
44 } 44 }
45 45
46 GuestViewBase::GuestViewBase(WebContents* guest_web_contents, 46 GuestViewBase::GuestViewBase(WebContents* guest_web_contents,
47 const std::string& embedder_extension_id) 47 const std::string& embedder_extension_id,
48 const base::WeakPtr<GuestViewBase>& opener)
48 : guest_web_contents_(guest_web_contents), 49 : guest_web_contents_(guest_web_contents),
49 embedder_web_contents_(NULL), 50 embedder_web_contents_(NULL),
50 embedder_extension_id_(embedder_extension_id), 51 embedder_extension_id_(embedder_extension_id),
51 embedder_render_process_id_(0), 52 embedder_render_process_id_(0),
52 browser_context_(guest_web_contents->GetBrowserContext()), 53 browser_context_(guest_web_contents->GetBrowserContext()),
53 guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()), 54 guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
54 view_instance_id_(guestview::kInstanceIDNone), 55 view_instance_id_(guestview::kInstanceIDNone),
56 opener_(opener),
55 weak_ptr_factory_(this) { 57 weak_ptr_factory_(this) {
56 webcontents_guestview_map.Get().insert( 58 webcontents_guestview_map.Get().insert(
57 std::make_pair(guest_web_contents, this)); 59 std::make_pair(guest_web_contents, this));
58 } 60 }
59 61
60 // static 62 // static
61 GuestViewBase* GuestViewBase::Create(WebContents* guest_web_contents, 63 GuestViewBase* GuestViewBase::Create(
62 const std::string& embedder_extension_id, 64 WebContents* guest_web_contents,
63 const std::string& view_type) { 65 const std::string& embedder_extension_id,
66 const std::string& view_type,
67 const base::WeakPtr<GuestViewBase>& opener) {
64 if (view_type == "webview") { 68 if (view_type == "webview") {
65 return new WebViewGuest(guest_web_contents, embedder_extension_id); 69 return new WebViewGuest(guest_web_contents, embedder_extension_id, opener);
66 } else if (view_type == "adview") { 70 } else if (view_type == "adview") {
67 return new AdViewGuest(guest_web_contents, embedder_extension_id); 71 return new AdViewGuest(guest_web_contents, embedder_extension_id);
68 } 72 }
69 NOTREACHED(); 73 NOTREACHED();
70 return NULL; 74 return NULL;
71 } 75 }
72 76
73 // static 77 // static
74 GuestViewBase* GuestViewBase::FromWebContents(WebContents* web_contents) { 78 GuestViewBase* GuestViewBase::FromWebContents(WebContents* web_contents) {
75 WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer(); 79 WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 incognito)); 125 incognito));
122 126
123 rules->script_rules.push_back( 127 rules->script_rules.push_back(
124 ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), 128 ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
125 ContentSettingsPattern::Wildcard(), 129 ContentSettingsPattern::Wildcard(),
126 CONTENT_SETTING_ALLOW, 130 CONTENT_SETTING_ALLOW,
127 std::string(), 131 std::string(),
128 incognito)); 132 incognito));
129 } 133 }
130 134
135 base::WeakPtr<GuestViewBase> GuestViewBase::AsWeakPtr() {
136 return weak_ptr_factory_.GetWeakPtr();
137 }
138
131 void GuestViewBase::Attach(content::WebContents* embedder_web_contents, 139 void GuestViewBase::Attach(content::WebContents* embedder_web_contents,
132 const base::DictionaryValue& args) { 140 const base::DictionaryValue& args) {
133 embedder_web_contents_ = embedder_web_contents; 141 embedder_web_contents_ = embedder_web_contents;
134 embedder_render_process_id_ = 142 embedder_render_process_id_ =
135 embedder_web_contents->GetRenderProcessHost()->GetID(); 143 embedder_web_contents->GetRenderProcessHost()->GetID();
136 args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_); 144 args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
137 145
138 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 146 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
139 embedder_guestview_map.Get().insert(std::make_pair(key, this)); 147 embedder_guestview_map.Get().insert(std::make_pair(key, this));
140 148
141 // GuestViewBase::Attach is called prior to initialization (and initial 149 // GuestViewBase::Attach is called prior to initialization (and initial
142 // navigation) of the guest in the content layer in order to permit mapping 150 // navigation) of the guest in the content layer in order to permit mapping
143 // the necessary associations between the <*view> element and its guest. This 151 // the necessary associations between the <*view> element and its guest. This
144 // is needed by the <webview> WebRequest API to allow intercepting resource 152 // is needed by the <webview> WebRequest API to allow intercepting resource
145 // requests during navigation. However, queued events should be fired after 153 // requests during navigation. However, queued events should be fired after
146 // content layer initialization in order to ensure that load events (such as 154 // content layer initialization in order to ensure that load events (such as
147 // 'loadstop') fire in embedder after the contentWindow is available. 155 // 'loadstop') fire in embedder after the contentWindow is available.
148 if (!in_extension()) 156 if (!in_extension())
149 return; 157 return;
150 158
151 base::MessageLoop::current()->PostTask( 159 base::MessageLoop::current()->PostTask(
152 FROM_HERE, 160 FROM_HERE,
153 base::Bind(&GuestViewBase::SendQueuedEvents, 161 base::Bind(&GuestViewBase::SendQueuedEvents,
154 weak_ptr_factory_.GetWeakPtr())); 162 weak_ptr_factory_.GetWeakPtr()));
155 } 163 }
156 164
165 WebContents* GuestViewBase::GetOpener() const {
166 if (!opener_)
167 return NULL;
168 return opener_->guest_web_contents();
169 }
170
171 void GuestViewBase::SetOpener(WebContents* web_contents) {
172 GuestViewBase* guest = FromWebContents(web_contents);
173 if (guest) {
174 opener_ = guest->AsWeakPtr();
175 return;
176 }
177 opener_ = base::WeakPtr<GuestViewBase>();
178 }
179
157 GuestViewBase::~GuestViewBase() { 180 GuestViewBase::~GuestViewBase() {
158 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); 181 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
159 embedder_guestview_map.Get().erase(key); 182 embedder_guestview_map.Get().erase(key);
160 183
161 webcontents_guestview_map.Get().erase(guest_web_contents()); 184 webcontents_guestview_map.Get().erase(guest_web_contents());
162 185
163 pending_events_.clear(); 186 pending_events_.clear();
164 } 187 }
165 188
166 void GuestViewBase::DispatchEvent(Event* event) { 189 void GuestViewBase::DispatchEvent(Event* event) {
(...skipping 29 matching lines...) Expand all
196 void GuestViewBase::SendQueuedEvents() { 219 void GuestViewBase::SendQueuedEvents() {
197 if (!attached()) 220 if (!attached())
198 return; 221 return;
199 222
200 while (!pending_events_.empty()) { 223 while (!pending_events_.empty()) {
201 linked_ptr<Event> event_ptr = pending_events_.front(); 224 linked_ptr<Event> event_ptr = pending_events_.front();
202 pending_events_.pop_front(); 225 pending_events_.pop_front();
203 DispatchEvent(event_ptr.release()); 226 DispatchEvent(event_ptr.release());
204 } 227 }
205 } 228 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698