Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/guestview/guestview.h" | 5 #include "chrome/browser/guestview/guestview.h" |
| 6 | 6 |
| 7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
| 8 #include "chrome/browser/guestview/adview/adview_guest.h" | 8 #include "chrome/browser/guestview/adview/adview_guest.h" |
| 9 #include "chrome/browser/guestview/guestview_constants.h" | 9 #include "chrome/browser/guestview/guestview_constants.h" |
| 10 #include "chrome/browser/guestview/webview/webview_guest.h" | 10 #include "chrome/browser/guestview/webview/webview_guest.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/common/content_settings.h" | |
| 12 #include "content/public/browser/render_process_host.h" | 13 #include "content/public/browser/render_process_host.h" |
| 13 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 14 #include "content/public/common/url_constants.h" | 15 #include "content/public/common/url_constants.h" |
| 15 #include "extensions/browser/event_router.h" | 16 #include "extensions/browser/event_router.h" |
| 16 #include "net/base/escape.h" | 17 #include "net/base/escape.h" |
| 17 | 18 |
| 18 using content::WebContents; | 19 using content::WebContents; |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| 21 | 22 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 111 // Since persistence is optional, the path must either be empty or the | 112 // Since persistence is optional, the path must either be empty or the |
| 112 // literal string. | 113 // literal string. |
| 113 *in_memory = (site.path() != "/persist"); | 114 *in_memory = (site.path() != "/persist"); |
| 114 // The partition name is user supplied value, which we have encoded when the | 115 // The partition name is user supplied value, which we have encoded when the |
| 115 // URL was created, so it needs to be decoded. | 116 // URL was created, so it needs to be decoded. |
| 116 *partition_name = net::UnescapeURLComponent(site.query(), | 117 *partition_name = net::UnescapeURLComponent(site.query(), |
| 117 net::UnescapeRule::NORMAL); | 118 net::UnescapeRule::NORMAL); |
| 118 return true; | 119 return true; |
| 119 } | 120 } |
| 120 | 121 |
| 122 // static | |
| 123 void GuestView::GetDefaultContentSettingRules( | |
| 124 RendererContentSettingRules* rules) { | |
| 125 rules->image_rules.clear(); | |
| 126 rules->image_rules.push_back(ContentSettingPatternSource( | |
| 127 ContentSettingsPattern::Wildcard(), | |
| 128 ContentSettingsPattern::Wildcard(), | |
| 129 CONTENT_SETTING_ALLOW, | |
| 130 "default", | |
| 131 false)); | |
|
jochen (gone - plz use gerrit)
2013/12/03 08:55:21
please add incongito as parameter instead of creat
Fady Samuel
2013/12/03 15:31:27
Done.
| |
| 132 rules->image_rules.push_back(ContentSettingPatternSource( | |
| 133 ContentSettingsPattern::Wildcard(), | |
| 134 ContentSettingsPattern::Wildcard(), | |
| 135 CONTENT_SETTING_ALLOW, | |
| 136 "default", | |
| 137 true)); | |
| 138 | |
| 139 rules->script_rules.clear(); | |
| 140 rules->script_rules.push_back(ContentSettingPatternSource( | |
| 141 ContentSettingsPattern::Wildcard(), | |
| 142 ContentSettingsPattern::Wildcard(), | |
| 143 CONTENT_SETTING_ALLOW, | |
| 144 std::string(), | |
| 145 false)); | |
| 146 rules->script_rules.push_back(ContentSettingPatternSource( | |
| 147 ContentSettingsPattern::Wildcard(), | |
| 148 ContentSettingsPattern::Wildcard(), | |
| 149 CONTENT_SETTING_ALLOW, | |
| 150 std::string(), | |
| 151 true)); | |
| 152 } | |
| 153 | |
| 121 void GuestView::Attach(content::WebContents* embedder_web_contents, | 154 void GuestView::Attach(content::WebContents* embedder_web_contents, |
| 122 const base::DictionaryValue& args) { | 155 const base::DictionaryValue& args) { |
| 123 embedder_web_contents_ = embedder_web_contents; | 156 embedder_web_contents_ = embedder_web_contents; |
| 124 embedder_render_process_id_ = | 157 embedder_render_process_id_ = |
| 125 embedder_web_contents->GetRenderProcessHost()->GetID(); | 158 embedder_web_contents->GetRenderProcessHost()->GetID(); |
| 126 args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_); | 159 args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_); |
| 127 | 160 |
| 128 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); | 161 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); |
| 129 embedder_guestview_map.Get().insert(std::make_pair(key, this)); | 162 embedder_guestview_map.Get().insert(std::make_pair(key, this)); |
| 130 | 163 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 190 void GuestView::SendQueuedEvents() { | 223 void GuestView::SendQueuedEvents() { |
| 191 if (!attached()) | 224 if (!attached()) |
| 192 return; | 225 return; |
| 193 | 226 |
| 194 while (!pending_events_.empty()) { | 227 while (!pending_events_.empty()) { |
| 195 Event* event = pending_events_.front(); | 228 Event* event = pending_events_.front(); |
| 196 pending_events_.pop(); | 229 pending_events_.pop(); |
| 197 DispatchEvent(event); | 230 DispatchEvent(event); |
| 198 } | 231 } |
| 199 } | 232 } |
| OLD | NEW |