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

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 2543613002: Revert "Don't update TabSpecificContentSettings on same-page navigation" (Closed)
Patch Set: Created 4 years 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/content_settings/tab_specific_content_settings.cc
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index fd04a18f5d13357cf60ebe586d5c2fabb88451c8..723d92409459d843dd53ac3fc363c046ee719965 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -37,7 +37,6 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_frame_host.h"
@@ -54,21 +53,22 @@ using content::NavigationController;
using content::NavigationEntry;
using content::WebContents;
-namespace {
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabSpecificContentSettings);
-static TabSpecificContentSettings* GetForWCGetter(
- const base::Callback<content::WebContents*(void)>& wc_getter) {
- WebContents* web_contents = wc_getter.Run();
- if (!web_contents)
- return nullptr;
+namespace {
- return TabSpecificContentSettings::FromWebContents(web_contents);
+ContentSettingsUsagesState::CommittedDetails GetCommittedDetails(
+ const content::LoadCommittedDetails& details) {
+ ContentSettingsUsagesState::CommittedDetails committed_details;
+ committed_details.current_url_valid = !!details.entry;
+ if (details.entry)
+ committed_details.current_url = details.entry->GetURL();
+ committed_details.previous_url = details.previous_url;
+ return committed_details;
}
} // namespace
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabSpecificContentSettings);
-
TabSpecificContentSettings::SiteDataObserver::SiteDataObserver(
TabSpecificContentSettings* tab_specific_content_settings)
: tab_specific_content_settings_(tab_specific_content_settings) {
@@ -133,14 +133,15 @@ TabSpecificContentSettings* TabSpecificContentSettings::GetForFrame(
}
// static
-void TabSpecificContentSettings::CookiesRead(
- const base::Callback<content::WebContents*(void)>& wc_getter,
- const GURL& url,
- const GURL& frame_url,
- const net::CookieList& cookie_list,
- bool blocked_by_policy) {
+void TabSpecificContentSettings::CookiesRead(int render_process_id,
+ int render_frame_id,
+ const GURL& url,
+ const GURL& frame_url,
+ const net::CookieList& cookie_list,
+ bool blocked_by_policy) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- TabSpecificContentSettings* settings = GetForWCGetter(wc_getter);
+ TabSpecificContentSettings* settings =
+ GetForFrame(render_process_id, render_frame_id);
if (settings) {
settings->OnCookiesRead(url, frame_url, cookie_list,
blocked_by_policy);
@@ -149,14 +150,16 @@ void TabSpecificContentSettings::CookiesRead(
// static
void TabSpecificContentSettings::CookieChanged(
- const base::Callback<WebContents*(void)>& wc_getter,
+ int render_process_id,
+ int render_frame_id,
const GURL& url,
const GURL& frame_url,
const std::string& cookie_line,
const net::CookieOptions& options,
bool blocked_by_policy) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- TabSpecificContentSettings* settings = GetForWCGetter(wc_getter);
+ TabSpecificContentSettings* settings =
+ GetForFrame(render_process_id, render_frame_id);
if (settings)
settings->OnCookieChanged(url, frame_url, cookie_line, options,
blocked_by_policy);
@@ -798,48 +801,41 @@ bool TabSpecificContentSettings::OnMessageReceived(
return handled;
}
-void TabSpecificContentSettings::DidStartNavigation(
- content::NavigationHandle* navigation_handle) {
- if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSamePage())
- return;
+void TabSpecificContentSettings::DidNavigateMainFrame(
+ const content::LoadCommittedDetails& details,
+ const content::FrameNavigateParams& params) {
+ if (!details.is_in_page) {
+ // Clear "blocked" flags.
+ ClearContentSettingsExceptForNavigationRelatedSettings();
+ blocked_plugin_names_.clear();
+ GeolocationDidNavigate(details);
+ MidiDidNavigate(details);
- const content::NavigationController& controller =
- web_contents()->GetController();
- content::NavigationEntry* last_committed_entry =
- controller.GetLastCommittedEntry();
- if (last_committed_entry)
- previous_url_ = last_committed_entry->GetURL();
+ if (web_contents()->GetVisibleURL().SchemeIsHTTPOrHTTPS()) {
+ content_settings::RecordPluginsAction(
+ content_settings::PLUGINS_ACTION_TOTAL_NAVIGATIONS);
+ }
+ }
+}
+
+void TabSpecificContentSettings::DidStartProvisionalLoadForFrame(
+ content::RenderFrameHost* render_frame_host,
+ const GURL& validated_url,
+ bool is_error_page,
+ bool is_iframe_srcdoc) {
+ if (render_frame_host->GetParent())
+ return;
// If we're displaying a network error page do not reset the content
// settings delegate's cookies so the user has a chance to modify cookie
// settings.
- if (!navigation_handle->IsErrorPage())
+ if (!is_error_page)
ClearNavigationRelatedContentSettings();
ClearGeolocationContentSettings();
ClearMidiContentSettings();
ClearPendingProtocolHandler();
}
-void TabSpecificContentSettings::DidFinishNavigation(
- content::NavigationHandle* navigation_handle) {
- if (!navigation_handle->IsInMainFrame() ||
- !navigation_handle->HasCommitted() ||
- navigation_handle->IsSamePage()) {
- return;
- }
-
- // Clear "blocked" flags.
- ClearContentSettingsExceptForNavigationRelatedSettings();
- blocked_plugin_names_.clear();
- GeolocationDidNavigate(navigation_handle);
- MidiDidNavigate(navigation_handle);
-
- if (web_contents()->GetVisibleURL().SchemeIsHTTPOrHTTPS()) {
- content_settings::RecordPluginsAction(
- content_settings::PLUGINS_ACTION_TOTAL_NAVIGATIONS);
- }
-}
-
void TabSpecificContentSettings::AppCacheAccessed(const GURL& manifest_url,
bool blocked_by_policy) {
if (blocked_by_policy) {
@@ -874,20 +870,13 @@ void TabSpecificContentSettings::ClearMidiContentSettings() {
}
void TabSpecificContentSettings::GeolocationDidNavigate(
- content::NavigationHandle* navigation_handle) {
- ContentSettingsUsagesState::CommittedDetails committed_details;
- committed_details.current_url = navigation_handle->GetURL();
- committed_details.previous_url = previous_url_;
-
- geolocation_usages_state_.DidNavigate(committed_details);
+ const content::LoadCommittedDetails& details) {
+ geolocation_usages_state_.DidNavigate(GetCommittedDetails(details));
}
void TabSpecificContentSettings::MidiDidNavigate(
- content::NavigationHandle* navigation_handle) {
- ContentSettingsUsagesState::CommittedDetails committed_details;
- committed_details.current_url = navigation_handle->GetURL();
- committed_details.previous_url = previous_url_;
- midi_usages_state_.DidNavigate(committed_details);
+ const content::LoadCommittedDetails& details) {
+ midi_usages_state_.DidNavigate(GetCommittedDetails(details));
}
void TabSpecificContentSettings::BlockAllContentForTesting() {
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.h ('k') | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698