OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/content_settings/tab_specific_content_settings.h" | 5 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 GeolocationDidNavigate(details); | 492 GeolocationDidNavigate(details); |
493 } | 493 } |
494 } | 494 } |
495 | 495 |
496 void TabSpecificContentSettings::DidStartProvisionalLoadForFrame( | 496 void TabSpecificContentSettings::DidStartProvisionalLoadForFrame( |
497 int64 frame_id, | 497 int64 frame_id, |
498 int64 parent_frame_id, | 498 int64 parent_frame_id, |
499 bool is_main_frame, | 499 bool is_main_frame, |
500 const GURL& validated_url, | 500 const GURL& validated_url, |
501 bool is_error_page, | 501 bool is_error_page, |
| 502 bool is_iframe_srcdoc, |
502 RenderViewHost* render_view_host) { | 503 RenderViewHost* render_view_host) { |
503 if (!is_main_frame) | 504 if (!is_main_frame) |
504 return; | 505 return; |
505 | 506 |
506 // If we're displaying a network error page do not reset the content | 507 // If we're displaying a network error page do not reset the content |
507 // settings delegate's cookies so the user has a chance to modify cookie | 508 // settings delegate's cookies so the user has a chance to modify cookie |
508 // settings. | 509 // settings. |
509 if (!is_error_page) | 510 if (!is_error_page) |
510 ClearCookieSpecificContentSettings(); | 511 ClearCookieSpecificContentSettings(); |
511 ClearGeolocationContentSettings(); | 512 ClearGeolocationContentSettings(); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 } | 554 } |
554 | 555 |
555 void TabSpecificContentSettings::RemoveSiteDataObserver( | 556 void TabSpecificContentSettings::RemoveSiteDataObserver( |
556 SiteDataObserver* observer) { | 557 SiteDataObserver* observer) { |
557 observer_list_.RemoveObserver(observer); | 558 observer_list_.RemoveObserver(observer); |
558 } | 559 } |
559 | 560 |
560 void TabSpecificContentSettings::NotifySiteDataObservers() { | 561 void TabSpecificContentSettings::NotifySiteDataObservers() { |
561 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed()); | 562 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed()); |
562 } | 563 } |
OLD | NEW |