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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 3263007: Reland r57788 - Expose Extension Bindings to Component Applications (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: don't hide gallery url in omnibar Created 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index b22c2f8c9c62a07ae0f1fdc470b3823fed0c8a6f..286dbefca741061d731558c6a55aa10cf248074a 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -858,7 +858,7 @@ bool TabContents::NavigateToPendingEntry(
// to a DOM UI renderer. Double check that here.
int enabled_bindings = dest_render_view_host->enabled_bindings();
bool is_allowed_in_dom_ui_renderer =
- DOMUIFactory::UseDOMUIForURL(entry.url()) ||
+ DOMUIFactory::UseDOMUIForURL(profile(), entry.url()) ||
entry.url() == GURL(chrome::kAboutBlankURL);
CHECK(!BindingsPolicy::is_dom_ui_enabled(enabled_bindings) ||
is_allowed_in_dom_ui_renderer);
@@ -1604,7 +1604,8 @@ void TabContents::DidNavigateMainFramePostCommit(
// If this is a window.open navigation, use the same DOMUI as the renderer
// that opened the window, as long as both renderers have the same
// privileges.
- if (opener_dom_ui_type_ == DOMUIFactory::GetDOMUIType(GetURL())) {
+ if (opener_dom_ui_type_ ==
+ DOMUIFactory::GetDOMUIType(profile(), GetURL())) {
DOMUI* dom_ui = DOMUIFactory::CreateDOMUIForURL(this, GetURL());
// dom_ui might be NULL if the URL refers to a non-existent extension.
if (dom_ui) {
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_manager.cc ('k') | chrome/browser/tab_contents/tab_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698