diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 17:25:16 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 17:25:16 +0000 |
| commit | 821825658763d672a40ff332753103108323dbaa (patch) | |
| tree | 3314c03bdf9cce689e181e6c768146804b7237db /chrome/browser | |
| parent | 145ecbde35f4fb20cf384fdae4453234407c7243 (diff) | |
| download | chromium_src-821825658763d672a40ff332753103108323dbaa.zip chromium_src-821825658763d672a40ff332753103108323dbaa.tar.gz chromium_src-821825658763d672a40ff332753103108323dbaa.tar.bz2 | |
Revert 43962 - Adds a safety check for DOM UI renderers.
(Currently crashing on reliability bot.)
We should not be passing web URLs to DOM UI renderers. This CL adds a
check to ensure that we only navigate to DOM UI URLs in such renderers.
BUG=40575
TEST=none
Review URL: http://codereview.chromium.org/1549027
TBR=brettw
Review URL: http://codereview.chromium.org/1626012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.h | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 3492603..0601821 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -323,10 +323,6 @@ class RenderViewHost : public RenderWidgetHost { // should be a combination of values from BindingsPolicy. void AllowBindings(int binding_flags); - // Returns a bitwise OR of bindings types that have been enabled for this - // RenderView. See BindingsPolicy for details. - int enabled_bindings() { return enabled_bindings_; } - // Sets a property with the given name and value on the DOM UI binding object. // Must call AllowDOMUIBindings() on this renderer first. void SetDOMUIProperty(const std::string& name, const std::string& value); diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index e35ab19..27d67ec 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -64,7 +64,6 @@ #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/thumbnail_store.h" #include "chrome/browser/translate/page_translated_details.h" -#include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" @@ -758,12 +757,6 @@ bool TabContents::NavigateToPendingEntry( if (!dest_render_view_host) return false; // Unable to create the desired render view host. - // For security, we should never send non-DOM-UI URLs to a DOM UI renderer. - // Double check that here. - int enabled_bindings = dest_render_view_host->enabled_bindings(); - CHECK(!BindingsPolicy::is_dom_ui_enabled(enabled_bindings) || - DOMUIFactory::HasDOMUIScheme(entry.url())); - // Tell DevTools agent that it is attached prior to the navigation. DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); if (devtools_manager) { // NULL in unit tests. |