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

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

Issue 293093010: Rename RenderProcessHost::IsGuest to RenderProcessHost::IsIsolatedGuest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_isguest_chrome_callsites
Patch Set: Fixed interactive_ui_tests build 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/guest_view/guest_view_manager.cc
diff --git a/chrome/browser/guest_view/guest_view_manager.cc b/chrome/browser/guest_view/guest_view_manager.cc
index efd5708e35a70a7899c6c65080c61eb31e832eaf..d3be4e6d876976ba44ea7d7b388ea76b37576bf7 100644
--- a/chrome/browser/guest_view/guest_view_manager.cc
+++ b/chrome/browser/guest_view/guest_view_manager.cc
@@ -23,42 +23,6 @@ using content::BrowserContext;
using content::SiteInstance;
using content::WebContents;
-// A WebContents does not immediately have a RenderProcessHost. It acquires one
-// on initial navigation. This observer exists until that initial navigation in
-// order to grab the ID if tis RenderProcessHost so that it can register it as
-// a guest.
-class GuestWebContentsObserver
- : public content::WebContentsObserver {
- public:
- explicit GuestWebContentsObserver(WebContents* guest_web_contents)
- : WebContentsObserver(guest_web_contents) {
- }
-
- virtual ~GuestWebContentsObserver() {
- }
-
- // WebContentsObserver:
- virtual void DidStartProvisionalLoadForFrame(
- int64 frame_id,
- int64 parent_frame_id,
- bool is_main_frame,
- const GURL& validated_url,
- bool is_error_page,
- bool is_iframe_srcdoc,
- content::RenderViewHost* render_view_host) OVERRIDE {
- GuestViewManager::FromBrowserContext(web_contents()->GetBrowserContext())->
- AddRenderProcessHostID(web_contents()->GetRenderProcessHost()->GetID());
- delete this;
- }
-
- virtual void WebContentsDestroyed() OVERRIDE {
- delete this;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(GuestWebContentsObserver);
-};
-
GuestViewManager::GuestViewManager(content::BrowserContext* context)
: current_instance_id_(0), last_instance_id_removed_(0), context_(context) {
}
@@ -193,16 +157,12 @@ void GuestViewManager::AddGuest(int guest_instance_id,
CHECK(!ContainsKey(guest_web_contents_by_instance_id_, guest_instance_id));
CHECK(CanUseGuestInstanceID(guest_instance_id));
guest_web_contents_by_instance_id_[guest_instance_id] = guest_web_contents;
- // This will add the RenderProcessHost ID when we get one.
- new GuestWebContentsObserver(guest_web_contents);
}
void GuestViewManager::RemoveGuest(int guest_instance_id) {
GuestInstanceMap::iterator it =
guest_web_contents_by_instance_id_.find(guest_instance_id);
DCHECK(it != guest_web_contents_by_instance_id_.end());
- render_process_host_id_multiset_.erase(
- it->second->GetRenderProcessHost()->GetID());
guest_web_contents_by_instance_id_.erase(it);
// All the instance IDs that lie within [0, last_instance_id_removed_]
@@ -229,10 +189,6 @@ void GuestViewManager::RemoveGuest(int guest_instance_id) {
}
}
-void GuestViewManager::AddRenderProcessHostID(int render_process_host_id) {
- render_process_host_id_multiset_.insert(render_process_host_id);
-}
-
content::WebContents* GuestViewManager::GetGuestByInstanceID(
int guest_instance_id,
int embedder_render_process_id) {
« no previous file with comments | « chrome/browser/guest_view/guest_view_manager.h ('k') | chrome/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698