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

Side by Side Diff: trunk/src/chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 271863005: Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 5 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 632
633 void TabSpecificContentSettings::RenderFrameForInterstitialPageCreated( 633 void TabSpecificContentSettings::RenderFrameForInterstitialPageCreated(
634 content::RenderFrameHost* render_frame_host) { 634 content::RenderFrameHost* render_frame_host) {
635 // We want to tell the renderer-side code to ignore content settings for this 635 // We want to tell the renderer-side code to ignore content settings for this
636 // page. 636 // page.
637 render_frame_host->Send(new ChromeViewMsg_SetAsInterstitial( 637 render_frame_host->Send(new ChromeViewMsg_SetAsInterstitial(
638 render_frame_host->GetRoutingID())); 638 render_frame_host->GetRoutingID()));
639 } 639 }
640 640
641 bool TabSpecificContentSettings::OnMessageReceived( 641 bool TabSpecificContentSettings::OnMessageReceived(
642 const IPC::Message& message, 642 const IPC::Message& message) {
643 content::RenderFrameHost* render_frame_host) {
644 bool handled = true; 643 bool handled = true;
645 IPC_BEGIN_MESSAGE_MAP(TabSpecificContentSettings, message) 644 IPC_BEGIN_MESSAGE_MAP(TabSpecificContentSettings, message)
646 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked, OnContentBlocked) 645 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked, OnContentBlocked)
647 IPC_MESSAGE_UNHANDLED(handled = false) 646 IPC_MESSAGE_UNHANDLED(handled = false)
648 IPC_END_MESSAGE_MAP() 647 IPC_END_MESSAGE_MAP()
649 return handled; 648 return handled;
650 } 649 }
651 650
652 void TabSpecificContentSettings::DidNavigateMainFrame( 651 void TabSpecificContentSettings::DidNavigateMainFrame(
653 const content::LoadCommittedDetails& details, 652 const content::LoadCommittedDetails& details,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 } 722 }
724 723
725 void TabSpecificContentSettings::RemoveSiteDataObserver( 724 void TabSpecificContentSettings::RemoveSiteDataObserver(
726 SiteDataObserver* observer) { 725 SiteDataObserver* observer) {
727 observer_list_.RemoveObserver(observer); 726 observer_list_.RemoveObserver(observer);
728 } 727 }
729 728
730 void TabSpecificContentSettings::NotifySiteDataObservers() { 729 void TabSpecificContentSettings::NotifySiteDataObservers() {
731 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed()); 730 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
732 } 731 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698