Remove the last content settings include from content.

BUG=76793
Review URL: http://codereview.chromium.org/7011045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85333 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 21 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
index ca5f7c5..38fc3cb 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -14,11 +14,6 @@ include_rules = [
 

   "+chrome/browser/browser_url_handler.h",

 

-  # http://crbug.com/76793

-  "+chrome/browser/content_settings/host_content_settings_map.h",

-  "+chrome/browser/content_settings/tab_specific_content_settings.h",

-  "+chrome/common/content_settings_types.h",

-

   "+chrome/browser/chromeos/cros/cros_library.h",

   "+chrome/browser/chromeos/cros/network_library.h",

   "+chrome/browser/chromeos/plugin_selection_policy.h",

diff --git a/content/browser/tab_contents/tab_contents_delegate.cc b/content/browser/tab_contents/tab_contents_delegate.cc
index cad0309..378c48e 100644
--- a/content/browser/tab_contents/tab_contents_delegate.cc
+++ b/content/browser/tab_contents/tab_contents_delegate.cc
@@ -38,8 +38,6 @@ void TabContentsDelegate::ContentsMouseEvent(
 
 void TabContentsDelegate::ContentsZoomChange(bool zoom_in) { }
 
-void TabContentsDelegate::OnContentSettingsChange(TabContents* source) { }
-
 bool TabContentsDelegate::IsApplication() const { return false; }
 
 void TabContentsDelegate::ConvertContentsToApplication(TabContents* source) { }
@@ -167,10 +165,6 @@ void TabContentsDelegate::ShowRepostFormWarningDialog(
     TabContents* tab_contents) {
 }
 
-void TabContentsDelegate::ShowContentSettingsPage(
-    ContentSettingsType content_type) {
-}
-
 void TabContentsDelegate::ShowCollectedCookiesDialog(
     TabContents* tab_contents) {
 }
diff --git a/content/browser/tab_contents/tab_contents_delegate.h b/content/browser/tab_contents/tab_contents_delegate.h
index 4638bdb..e0c95ac 100644
--- a/content/browser/tab_contents/tab_contents_delegate.h
+++ b/content/browser/tab_contents/tab_contents_delegate.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/common/content_settings_types.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/navigation_types.h"
 #include "content/common/page_transition_types.h"
@@ -131,12 +130,6 @@ class TabContentsDelegate {
   // Request the delegate to change the zoom level of the current tab.
   virtual void ContentsZoomChange(bool zoom_in);
 
-  // Notifies the delegate that something has changed about what content the
-  // TabContents is blocking.  Interested parties should call
-  // TabContents::IsContentBlocked() to see if something they care about has
-  // changed.
-  virtual void OnContentSettingsChange(TabContents* source);
-
   // Check whether this contents is inside a window dedicated to running a web
   // application.
   virtual bool IsApplication() const;
@@ -257,9 +250,6 @@ class TabContentsDelegate {
   // Shows the repost form confirmation dialog box.
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
 
-  // Shows the Content Settings page for a given content type.
-  virtual void ShowContentSettingsPage(ContentSettingsType content_type);
-
   // Shows the cookies collected in the tab contents.
   virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
 
diff --git a/content/common/notification_type.h b/content/common/notification_type.h
index 7f57c50..777f761 100644
--- a/content/common/notification_type.h
+++ b/content/common/notification_type.h
@@ -1100,6 +1100,10 @@ class NotificationType {
     // ContentSettingsNotificationsDetails.
     GEOLOCATION_SETTINGS_CHANGED,
 
+    // Sent when content settings change for a tab. The source is a TabContents
+    // object, the details are None.
+    TAB_CONTENT_SETTINGS_CHANGED,
+
     // Sync --------------------------------------------------------------------
 
     // Sent when the syncer is blocked configuring.