OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/browser/frame_host/interstitial_page_impl.h" | 5 #include "content/browser/frame_host/interstitial_page_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 DontProceed(); | 774 DontProceed(); |
775 } else { | 775 } else { |
776 // User decided to proceed and either the navigation was committed or | 776 // User decided to proceed and either the navigation was committed or |
777 // the tab was closed before that. | 777 // the tab was closed before that. |
778 Hide(); | 778 Hide(); |
779 } | 779 } |
780 } | 780 } |
781 | 781 |
782 void InterstitialPageImpl::TakeActionOnResourceDispatcher( | 782 void InterstitialPageImpl::TakeActionOnResourceDispatcher( |
783 ResourceRequestAction action) { | 783 ResourceRequestAction action) { |
784 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)) << | 784 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
785 "TakeActionOnResourceDispatcher should be called on the main thread."; | |
786 | 785 |
787 if (action == CANCEL || action == RESUME) { | 786 if (action == CANCEL || action == RESUME) { |
788 if (resource_dispatcher_host_notified_) | 787 if (resource_dispatcher_host_notified_) |
789 return; | 788 return; |
790 resource_dispatcher_host_notified_ = true; | 789 resource_dispatcher_host_notified_ = true; |
791 } | 790 } |
792 | 791 |
793 // The tab might not have a render_view_host if it was closed (in which case, | 792 // The tab might not have a render_view_host if it was closed (in which case, |
794 // we have taken care of the blocked requests when processing | 793 // we have taken care of the blocked requests when processing |
795 // NOTIFY_RENDER_WIDGET_HOST_DESTROYED. | 794 // NOTIFY_RENDER_WIDGET_HOST_DESTROYED. |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 896 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
898 const LoadCommittedDetails& load_details) { | 897 const LoadCommittedDetails& load_details) { |
899 interstitial_->OnNavigatingAwayOrTabClosing(); | 898 interstitial_->OnNavigatingAwayOrTabClosing(); |
900 } | 899 } |
901 | 900 |
902 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 901 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
903 interstitial_->OnNavigatingAwayOrTabClosing(); | 902 interstitial_->OnNavigatingAwayOrTabClosing(); |
904 } | 903 } |
905 | 904 |
906 } // namespace content | 905 } // namespace content |
OLD | NEW |