| 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 "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 5 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 11 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
| 11 #include "chrome/browser/ui/browser_navigator.h" | 12 #include "chrome/browser/ui/browser_navigator.h" |
| 12 #include "chrome/browser/ui/browser_navigator_params.h" | 13 #include "chrome/browser/ui/browser_navigator_params.h" |
| 13 #include "chrome/common/features.h" | 14 #include "chrome/common/features.h" |
| 14 #include "chrome/common/render_messages.h" | 15 #include "chrome/common/render_messages.h" |
| 15 #include "components/content_settings/core/browser/host_content_settings_map.h" | 16 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 16 #include "content/public/browser/navigation_controller.h" | 17 #include "content/public/browser/navigation_controller.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 PopupBlockerTabHelper::GetBlockedPopupRequests() { | 144 PopupBlockerTabHelper::GetBlockedPopupRequests() { |
| 144 PopupIdMap result; | 145 PopupIdMap result; |
| 145 for (IDMap<std::unique_ptr<BlockedRequest>>::const_iterator iter( | 146 for (IDMap<std::unique_ptr<BlockedRequest>>::const_iterator iter( |
| 146 &blocked_popups_); | 147 &blocked_popups_); |
| 147 !iter.IsAtEnd(); | 148 !iter.IsAtEnd(); |
| 148 iter.Advance()) { | 149 iter.Advance()) { |
| 149 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url; | 150 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url; |
| 150 } | 151 } |
| 151 return result; | 152 return result; |
| 152 } | 153 } |
| OLD | NEW |