| Index: chrome/renderer/content_settings_observer.cc
|
| diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
|
| index 1f540add83c2e5d17c7176d24357a4df3425a48f..0f9ea639c0a15069214ea13520048afb3409f561 100644
|
| --- a/chrome/renderer/content_settings_observer.cc
|
| +++ b/chrome/renderer/content_settings_observer.cc
|
| @@ -181,12 +181,12 @@ bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) {
|
|
|
| void ContentSettingsObserver::DidCommitProvisionalLoad(
|
| bool is_new_navigation,
|
| - bool is_same_page_navigation) {
|
| + bool is_same_document_navigation) {
|
| WebFrame* frame = render_frame()->GetWebFrame();
|
| if (frame->parent())
|
| return; // Not a top-level navigation.
|
|
|
| - if (!is_same_page_navigation) {
|
| + if (!is_same_document_navigation) {
|
| // Clear "block" flags for the new page. This needs to happen before any of
|
| // |allowScript()|, |allowScriptFromSource()|, |allowImage()|, or
|
| // |allowPlugins()| is called for the new page so that these functions can
|
|
|