Rename OnBlockedContentChange to OnContentSettingsChange.

BUG=None
TEST=compiles

(Patch from Thiago Farina <thiago.farina@gmail.com> http://codereview.chromium.org/1664003/show)

Review URL: http://codereview.chromium.org/1750002

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

4 files changed, 7 insertions, 8 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 73913c2..9ae8b63 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -2383,7 +2383,7 @@ void Browser::ContentsZoomChange(bool zoom_in) {
   ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
 }
 
-void Browser::OnBlockedContentChange(TabContents* source) {
+void Browser::OnContentSettingsChange(TabContents* source) {
   if (source == GetSelectedTabContents())
     window_->GetLocationBar()->UpdateContentSettingsIcons();
 }
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 9d81731..67d940c 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -650,7 +650,7 @@ class Browser : public TabStripModelDelegate,
   virtual void ContentsMouseEvent(
       TabContents* source, const gfx::Point& location, bool motion);
   virtual void ContentsZoomChange(bool zoom_in);
-  virtual void OnBlockedContentChange(TabContents* source);
+  virtual void OnContentSettingsChange(TabContents* source);
   virtual void SetTabContentBlocked(TabContents* contents, bool blocked);
   virtual void TabContentsFocused(TabContents* tab_content);
   virtual bool TakeFocus(bool reverse);
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 42b8a64..5c265d9 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -926,7 +926,7 @@ void TabContents::PopupNotificationVisibilityChanged(bool visible) {
   if (!dont_notify_render_view_)
     render_view_host()->PopupNotificationVisibilityChanged(visible);
   if (delegate_)
-    delegate_->OnBlockedContentChange(this);
+    delegate_->OnContentSettingsChange(this);
 }
 
 gfx::NativeView TabContents::GetContentNativeView() const {
@@ -1561,7 +1561,7 @@ void TabContents::DidNavigateMainFramePostCommit(
     ClearBlockedContentSettings();
     ClearGeolocationContentSettings(details);
     if (delegate_)
-      delegate_->OnBlockedContentChange(this);
+      delegate_->OnContentSettingsChange(this);
   }
 
   // Close constrained windows if necessary.
@@ -2099,16 +2099,15 @@ void TabContents::OnContentBlocked(ContentSettingsType type) {
   DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION);
   content_blocked_[type] = true;
   if (delegate_)
-    delegate_->OnBlockedContentChange(this);
+    delegate_->OnContentSettingsChange(this);
 }
 
 void TabContents::OnGeolocationPermissionSet(const GURL& requesting_origin,
                                              bool allowed) {
   geolocation_content_settings_[requesting_origin] =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
-  // TODO(bulach): rename OnBlockedContentChange to OnContentSettingsChange.
   if (delegate_)
-    delegate_->OnBlockedContentChange(this);
+    delegate_->OnContentSettingsChange(this);
 }
 
 RenderViewHostDelegate::View* TabContents::GetViewDelegate() {
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index 9a84f83..c219c72 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -117,7 +117,7 @@ class TabContentsDelegate : public AutomationResourceRoutingDelegate {
   // TabContents is blocking.  Interested parties should call
   // TabContents::IsContentBlocked() to see if something they care about has
   // changed.
-  virtual void OnBlockedContentChange(TabContents* source) { }
+  virtual void OnContentSettingsChange(TabContents* source) { }
 
   // Check whether this contents is inside a window dedicated to running a web
   // application.