Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: chrome/browser/tab_contents/tab_specific_content_settings.cc

Issue 3305004: Fix geolocation icon behaviour on navigation (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/tab_contents/tab_specific_content_settings.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/tab_contents/tab_specific_content_settings.h" 5 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browsing_data_appcache_helper.h" 8 #include "chrome/browser/browsing_data_appcache_helper.h"
9 #include "chrome/browser/browsing_data_database_helper.h" 9 #include "chrome/browser/browsing_data_database_helper.h"
10 #include "chrome/browser/browsing_data_local_storage_helper.h" 10 #include "chrome/browser/browsing_data_local_storage_helper.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 content_blocked_[CONTENT_SETTINGS_TYPE_POPUPS] = blocked; 198 content_blocked_[CONTENT_SETTINGS_TYPE_POPUPS] = blocked;
199 if (delegate_) 199 if (delegate_)
200 delegate_->OnContentSettingsAccessed(blocked); 200 delegate_->OnContentSettingsAccessed(blocked);
201 } 201 }
202 202
203 void TabSpecificContentSettings::GeolocationDidNavigate( 203 void TabSpecificContentSettings::GeolocationDidNavigate(
204 const NavigationController::LoadCommittedDetails& details) { 204 const NavigationController::LoadCommittedDetails& details) {
205 geolocation_settings_state_.DidNavigate(details); 205 geolocation_settings_state_.DidNavigate(details);
206 } 206 }
207 207
208 void TabSpecificContentSettings::ClearGeolocationContentSettings() {
209 geolocation_settings_state_.ClearStateMap();
210 }
211
208 CookiesTreeModel* TabSpecificContentSettings::GetAllowedCookiesTreeModel() { 212 CookiesTreeModel* TabSpecificContentSettings::GetAllowedCookiesTreeModel() {
209 return allowed_local_shared_objects_.GetCookiesTreeModel(); 213 return allowed_local_shared_objects_.GetCookiesTreeModel();
210 } 214 }
211 215
212 CookiesTreeModel* TabSpecificContentSettings::GetBlockedCookiesTreeModel() { 216 CookiesTreeModel* TabSpecificContentSettings::GetBlockedCookiesTreeModel() {
213 return blocked_local_shared_objects_.GetCookiesTreeModel(); 217 return blocked_local_shared_objects_.GetCookiesTreeModel();
214 } 218 }
215 219
216 TabSpecificContentSettings::LocalSharedObjectsContainer:: 220 TabSpecificContentSettings::LocalSharedObjectsContainer::
217 LocalSharedObjectsContainer(Profile* profile) 221 LocalSharedObjectsContainer(Profile* profile)
(...skipping 14 matching lines...) Expand all
232 databases_->Reset(); 236 databases_->Reset();
233 local_storages_->Reset(); 237 local_storages_->Reset();
234 session_storages_->Reset(); 238 session_storages_->Reset();
235 } 239 }
236 240
237 CookiesTreeModel* 241 CookiesTreeModel*
238 TabSpecificContentSettings::LocalSharedObjectsContainer::GetCookiesTreeModel() { 242 TabSpecificContentSettings::LocalSharedObjectsContainer::GetCookiesTreeModel() {
239 return new CookiesTreeModel( 243 return new CookiesTreeModel(
240 cookies_, databases_, local_storages_, session_storages_, appcaches_); 244 cookies_, databases_, local_storages_, session_storages_, appcaches_);
241 } 245 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_specific_content_settings.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698