Adds GeolocationContentSettings on TabContents. ...

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 1293 matching lines @@
 
   return new_contents;
 }
 
 // Resets the |content_blocked_| array.
 void TabContents::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
 }
 
+// Resets the |geolocation_settings_| map.
+void TabContents::ClearGeolocationContentSettings() {
+  geolocation_content_settings_.clear();
+}
+
 // Notifies the RenderWidgetHost instance about the fact that the page is
 // loading, or done loading and calls the base implementation.
 void TabContents::SetIsLoading(bool is_loading,
                                LoadNotificationDetails* details) {
   if (is_loading == is_loading_)
     return;
 
   if (!is_loading) {
     load_state_ = net::LOAD_STATE_IDLE;
     load_state_host_.clear();
@@ skipping 167 matching lines @@
 
     // Close blocked popups.
     if (blocked_popups_) {
       AutoReset auto_reset(&dont_notify_render_view_, true);
       blocked_popups_->Destroy();
       blocked_popups_ = NULL;
     }
 
     // Clear "blocked" flags.
     ClearBlockedContentSettings();
+    ClearGeolocationContentSettings();
     if (delegate_)
       delegate_->OnBlockedContentChange(this);
   }
 
   // Close constrained windows if necessary.
   if (!net::RegistryControlledDomainService::SameDomainOrHost(
       details.previous_url, details.entry->url()))
     CloseConstrainedWindows();
 
   // Update the starred state.
@@ skipping 511 matching lines @@
 void TabContents::DocumentLoadedInFrame() {
   controller_.DocumentLoadedInFrame();
 }
 
 void TabContents::OnContentBlocked(ContentSettingsType type) {
   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.
+  if (delegate_)
+    delegate_->OnBlockedContentChange(this);
+}
+
 RenderViewHostDelegate::View* TabContents::GetViewDelegate() {
   return view_.get();
 }
 
 RenderViewHostDelegate::RendererManagement*
 TabContents::GetRendererManagementDelegate() {
   return &render_manager_;
 }
 
 RenderViewHostDelegate::BrowserIntegration*
@@ skipping 848 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);
 }