#include "chrome/browser/content_settings/local_shared_objects_container.h"
#include "chrome/browser/media/media_stream_devices_controller.h"
#include "chrome/common/content_settings.h"
-#include "chrome/common/content_settings_types.h"
#include "chrome/common/custom_handlers/protocol_handler.h"
+#include "components/content_settings/core/common/content_settings_types.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
// current page or while loading it. |blocked_by_policy| should be true, if
// reading cookies was blocked due to the user's content settings. In that
// case, this function should invoke OnContentBlocked.
+ // |is_for_blocking_resource| indicates whether the cookies read were for a
+ // blocking resource (eg script, css). It is only temporarily added for
+ // diagnostic purposes, per bug 353678. Will be removed again once data
+ // collection is finished.
static void CookiesRead(int render_process_id,
int render_frame_id,
const GURL& url,
const GURL& first_party_url,
const net::CookieList& cookie_list,
- bool blocked_by_policy);
+ bool blocked_by_policy,
+ bool is_for_blocking_resource);
// Called when a specific cookie in the current page was changed.
// |blocked_by_policy| should be true, if the cookie was blocked due to the
void ClearGeolocationContentSettings();
// Clears the MIDI settings.
- void ClearMIDIContentSettings();
+ void ClearMidiContentSettings();
// Changes the |content_blocked_| entry for popups.
void SetPopupsBlocked(bool blocked);
const content::LoadCommittedDetails& details);
// Updates MIDI settings on navigation.
- void MIDIDidNavigate(const content::LoadCommittedDetails& details);
+ void MidiDidNavigate(const content::LoadCommittedDetails& details);
// Returns whether a particular kind of content has been blocked for this
// page.
// content::WebContentsObserver overrides.
virtual void RenderFrameForInterstitialPageCreated(
content::RenderFrameHost* render_frame_host) OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual bool OnMessageReceived(
+ const IPC::Message& message,
+ content::RenderFrameHost* render_frame_host) OVERRIDE;
virtual void DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) OVERRIDE;
virtual void DidStartProvisionalLoadForFrame(
- int64 frame_id,
- int64 parent_frame_id,
- bool is_main_frame,
+ content::RenderFrameHost* render_frame_host,
const GURL& validated_url,
bool is_error_page,
- bool is_iframe_srcdoc,
- content::RenderViewHost* render_view_host) OVERRIDE;
+ bool is_iframe_srcdoc) OVERRIDE;
virtual void AppCacheAccessed(const GURL& manifest_url,
bool blocked_by_policy) OVERRIDE;
request_permissions);
// There methods are called to update the status about MIDI access.
- void OnMIDISysExAccessed(const GURL& reqesting_origin);
- void OnMIDISysExAccessBlocked(const GURL& requesting_origin);
+ void OnMidiSysExAccessed(const GURL& reqesting_origin);
+ void OnMidiSysExAccessBlocked(const GURL& requesting_origin);
// Adds the given |SiteDataObserver|. The |observer| is notified when a
// locale shared object, like for example a cookie, is accessed.