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

Unified Diff: chrome/browser/guest_view/guest_view_base.cc

Issue 257823005: [Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id...""" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/guest_view/guest_view_base.h ('k') | chrome/browser/guest_view/guest_view_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/guest_view/guest_view_base.cc
diff --git a/chrome/browser/guest_view/guest_view_base.cc b/chrome/browser/guest_view/guest_view_base.cc
deleted file mode 100644
index a6ea195dd6c32a5e0b2e8a4c9d60affc8fefaf3d..0000000000000000000000000000000000000000
--- a/chrome/browser/guest_view/guest_view_base.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/guest_view/guest_view_base.h"
-
-#include "base/lazy_instance.h"
-#include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
-#include "chrome/browser/guest_view/guest_view_constants.h"
-#include "chrome/browser/guest_view/web_view/web_view_guest.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/content_settings.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/url_constants.h"
-#include "extensions/browser/event_router.h"
-#include "net/base/escape.h"
-
-using content::WebContents;
-
-namespace {
-
-// <embedder_process_id, guest_instance_id> => GuestViewBase*
-typedef std::map<std::pair<int, int>, GuestViewBase*> EmbedderGuestViewMap;
-static base::LazyInstance<EmbedderGuestViewMap> embedder_guestview_map =
- LAZY_INSTANCE_INITIALIZER;
-
-typedef std::map<WebContents*, GuestViewBase*> WebContentsGuestViewMap;
-static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map =
- LAZY_INSTANCE_INITIALIZER;
-
-} // namespace
-
-GuestViewBase::Event::Event(const std::string& name,
- scoped_ptr<base::DictionaryValue> args)
- : name_(name), args_(args.Pass()) {
-}
-
-GuestViewBase::Event::~Event() {
-}
-
-scoped_ptr<base::DictionaryValue> GuestViewBase::Event::GetArguments() {
- return args_.Pass();
-}
-
-GuestViewBase::GuestViewBase(WebContents* guest_web_contents,
- const std::string& embedder_extension_id)
- : guest_web_contents_(guest_web_contents),
- embedder_web_contents_(NULL),
- embedder_extension_id_(embedder_extension_id),
- embedder_render_process_id_(0),
- browser_context_(guest_web_contents->GetBrowserContext()),
- guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
- view_instance_id_(guestview::kInstanceIDNone),
- weak_ptr_factory_(this) {
- webcontents_guestview_map.Get().insert(
- std::make_pair(guest_web_contents, this));
-}
-
-// static
-GuestViewBase* GuestViewBase::Create(WebContents* guest_web_contents,
- const std::string& embedder_extension_id,
- const std::string& view_type) {
- if (view_type == "webview") {
- return new WebViewGuest(guest_web_contents, embedder_extension_id);
- } else if (view_type == "adview") {
- return new AdViewGuest(guest_web_contents, embedder_extension_id);
- }
- NOTREACHED();
- return NULL;
-}
-
-// static
-GuestViewBase* GuestViewBase::FromWebContents(WebContents* web_contents) {
- WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
- WebContentsGuestViewMap::iterator it = guest_map->find(web_contents);
- return it == guest_map->end() ? NULL : it->second;
-}
-
-// static
-GuestViewBase* GuestViewBase::From(int embedder_process_id,
- int guest_instance_id) {
- EmbedderGuestViewMap* guest_map = embedder_guestview_map.Pointer();
- EmbedderGuestViewMap::iterator it =
- guest_map->find(std::make_pair(embedder_process_id, guest_instance_id));
- return it == guest_map->end() ? NULL : it->second;
-}
-
-// static
-bool GuestViewBase::GetGuestPartitionConfigForSite(
- const GURL& site,
- std::string* partition_domain,
- std::string* partition_name,
- bool* in_memory) {
- if (!site.SchemeIs(content::kGuestScheme))
- return false;
-
- // Since guest URLs are only used for packaged apps, there must be an app
- // id in the URL.
- CHECK(site.has_host());
- *partition_domain = site.host();
- // Since persistence is optional, the path must either be empty or the
- // literal string.
- *in_memory = (site.path() != "/persist");
- // The partition name is user supplied value, which we have encoded when the
- // URL was created, so it needs to be decoded.
- *partition_name =
- net::UnescapeURLComponent(site.query(), net::UnescapeRule::NORMAL);
- return true;
-}
-
-// static
-void GuestViewBase::GetDefaultContentSettingRules(
- RendererContentSettingRules* rules,
- bool incognito) {
- rules->image_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- incognito));
-
- rules->script_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- incognito));
-}
-
-void GuestViewBase::Attach(content::WebContents* embedder_web_contents,
- const base::DictionaryValue& args) {
- embedder_web_contents_ = embedder_web_contents;
- embedder_render_process_id_ =
- embedder_web_contents->GetRenderProcessHost()->GetID();
- args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
-
- std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
- embedder_guestview_map.Get().insert(std::make_pair(key, this));
-
- // GuestViewBase::Attach is called prior to initialization (and initial
- // navigation) of the guest in the content layer in order to permit mapping
- // the necessary associations between the <*view> element and its guest. This
- // is needed by the <webview> WebRequest API to allow intercepting resource
- // requests during navigation. However, queued events should be fired after
- // content layer initialization in order to ensure that load events (such as
- // 'loadstop') fire in embedder after the contentWindow is available.
- if (!in_extension())
- return;
-
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&GuestViewBase::SendQueuedEvents,
- weak_ptr_factory_.GetWeakPtr()));
-}
-
-GuestViewBase::~GuestViewBase() {
- std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
- embedder_guestview_map.Get().erase(key);
-
- webcontents_guestview_map.Get().erase(guest_web_contents());
-
- pending_events_.clear();
-}
-
-void GuestViewBase::DispatchEvent(Event* event) {
- scoped_ptr<Event> event_ptr(event);
- if (!in_extension()) {
- NOTREACHED();
- return;
- }
-
- if (!attached()) {
- pending_events_.push_back(linked_ptr<Event>(event_ptr.release()));
- return;
- }
-
- Profile* profile = Profile::FromBrowserContext(browser_context_);
-
- extensions::EventFilteringInfo info;
- info.SetURL(GURL());
- info.SetInstanceID(guest_instance_id_);
- scoped_ptr<base::ListValue> args(new base::ListValue());
- args->Append(event->GetArguments().release());
-
- extensions::EventRouter::DispatchEvent(
- embedder_web_contents_,
- profile,
- embedder_extension_id_,
- event->name(),
- args.Pass(),
- extensions::EventRouter::USER_GESTURE_UNKNOWN,
- info);
-}
-
-void GuestViewBase::SendQueuedEvents() {
- if (!attached())
- return;
-
- while (!pending_events_.empty()) {
- linked_ptr<Event> event_ptr = pending_events_.front();
- pending_events_.pop_front();
- DispatchEvent(event_ptr.release());
- }
-}
« no previous file with comments | « chrome/browser/guest_view/guest_view_base.h ('k') | chrome/browser/guest_view/guest_view_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698