Add Geolocation to the content types. This adds several special case guards s...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/auto_reset.h"
@@ skipping 604 matching lines @@
 bool TabContents::IsContentBlocked(ContentSettingsType content_type) const {
   if (content_type == CONTENT_SETTINGS_TYPE_POPUPS)
     return blocked_popups_ != NULL;
 
   if (content_type == CONTENT_SETTINGS_TYPE_IMAGES ||
       content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
       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;
 }
 
 std::wstring TabContents::GetStatusText() const {
   if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE)
     return std::wstring();
 
   switch (load_state_) {
     case net::LOAD_STATE_WAITING_FOR_CACHE:
@@ skipping 1388 matching lines @@
       NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
 }
 
 void TabContents::DocumentLoadedInFrame() {
   controller_.DocumentLoadedInFrame();
 }
 
 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);
 }
 
 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.
@@ skipping 862 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }