diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 13:46:36 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 13:46:36 +0000 |
| commit | aa43bc0f41919fc60b075e2e635985108bb0b870 (patch) | |
| tree | 02cc93e0837f9c22dd70e7781e6a00c8ed919c15 /chrome/browser/tab_contents | |
| parent | 3cc2e593f52cc27ca6694b6ec33f769f6d2dbd52 (diff) | |
| download | chromium_src-aa43bc0f41919fc60b075e2e635985108bb0b870.zip chromium_src-aa43bc0f41919fc60b075e2e635985108bb0b870.tar.gz chromium_src-aa43bc0f41919fc60b075e2e635985108bb0b870.tar.bz2 | |
Fix a couple small todos.
BUG=none
TEST=existing unit tests + run browser and use content blocked features.
Review URL: http://codereview.chromium.org/1513024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 78b2124..100be37 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -650,6 +650,8 @@ bool TabContents::ShouldDisplayFavIcon() { } bool TabContents::IsContentBlocked(ContentSettingsType content_type) const { + DCHECK(content_type != CONTENT_SETTINGS_TYPE_GEOLOCATION) + << "Geolocation settings handled by GeolocationContentSettingsMap"; if (content_type == CONTENT_SETTINGS_TYPE_POPUPS) return blocked_popups_ != NULL; @@ -659,10 +661,6 @@ bool TabContents::IsContentBlocked(ContentSettingsType content_type) const { content_type == CONTENT_SETTINGS_TYPE_COOKIES) return content_blocked_[content_type]; - // TODO(joth): remove once fully implemented. - if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) - return false; - NOTREACHED(); return false; } @@ -2137,8 +2135,8 @@ void TabContents::DocumentLoadedInFrame() { } void TabContents::OnContentBlocked(ContentSettingsType type) { - // TODO(joth): remove once fully implemented. - DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION); + DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION) + << "Geolocation settings handled by OnGeolocationPermissionSet"; content_blocked_[type] = true; if (delegate_) delegate_->OnContentSettingsChange(this); |