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

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

Issue 458323002: Change GuestViewInternalCreateGuestFunction to create the guest view using the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 6 years, 4 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 | Annotate | Revision Log
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 "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/guest_view/guest_view_manager.h" 9 #include "chrome/browser/guest_view/guest_view_manager.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 CHECK(feature); 112 CHECK(feature);
113 113
114 extensions::ProcessMap* process_map = 114 extensions::ProcessMap* process_map =
115 extensions::ProcessMap::Get(browser_context()); 115 extensions::ProcessMap::Get(browser_context());
116 CHECK(process_map); 116 CHECK(process_map);
117 117
118 const extensions::Extension* embedder_extension = 118 const extensions::Extension* embedder_extension =
119 extensions::ExtensionRegistry::Get(browser_context_) 119 extensions::ExtensionRegistry::Get(browser_context_)
120 ->enabled_extensions() 120 ->enabled_extensions()
121 .GetByID(embedder_extension_id); 121 .GetByID(embedder_extension_id);
122 // Ok for |embedder_extension| to be NULL, the embedder might be WebUI.
123
124 CHECK(embedder_web_contents);
122 int embedder_process_id = 125 int embedder_process_id =
123 embedder_web_contents->GetRenderProcessHost()->GetID(); 126 embedder_web_contents->GetRenderProcessHost()->GetID();
124 127
125 extensions::Feature::Availability availability = 128 extensions::Feature::Availability availability =
126 feature->IsAvailableToContext( 129 feature->IsAvailableToContext(
127 embedder_extension, 130 embedder_extension,
128 process_map->GetMostLikelyContextType(embedder_extension, 131 process_map->GetMostLikelyContextType(embedder_extension,
129 embedder_process_id), 132 embedder_process_id),
130 embedder_web_contents->GetLastCommittedURL()); 133 embedder_web_contents->GetLastCommittedURL());
131 if (!availability.is_available()) { 134 if (!availability.is_available()) {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 InitWithWebContents(embedder_extension_id, 444 InitWithWebContents(embedder_extension_id,
442 embedder_render_process_id, 445 embedder_render_process_id,
443 guest_web_contents); 446 guest_web_contents);
444 callback.Run(guest_web_contents); 447 callback.Run(guest_web_contents);
445 } 448 }
446 449
447 // static 450 // static
448 void GuestViewBase::RegisterGuestViewTypes() { 451 void GuestViewBase::RegisterGuestViewTypes() {
449 extensions::ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); 452 extensions::ExtensionsAPIClient::Get()->RegisterGuestViewTypes();
450 } 453 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698