commit b12350654488c041c407d7aefd4d016e97c3e204
author joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Mar 25 17:31:27 2010
committer joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Mar 25 17:31:27 2010
tree 28fe0a78bae8320e8051e3d469d082cf564c0dd4
parent 75393a5c79f92b579ff9535f6a22ee88f03365f5

Add Geolocation to the content types. This adds several special case guards so we can still build & run whilst the full implementation is being worked on (in parallel)

(Some code taken from http://codereview.chromium.org/650180)

BUG=11246
TEST=Built & ran on all three platforms. Used geolocation & open content setting dialog.

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

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

chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 3c728159..83b6f55 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -622,6 +622,10 @@
       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;
 }
@@ -2030,6 +2034,8 @@
 }
 
 void TabContents::OnContentBlocked(ContentSettingsType type) {
+  // TODO(joth): remove once fully implemented.
+  DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION);
   content_blocked_[type] = true;
   if (delegate_)
     delegate_->OnBlockedContentChange(this);