OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/blocked_content_container.h" | 5 #include "chrome/browser/ui/blocked_content/blocked_content_container.h" |
6 | 6 |
7 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 7 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
8 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 8 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
9 #include "content/browser/tab_contents/tab_contents.h" | 9 #include "content/browser/tab_contents/tab_contents.h" |
10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 TabContentsWrapper* tab_contents = i->tab_contents; | 100 TabContentsWrapper* tab_contents = i->tab_contents; |
101 tab_contents->tab_contents()->set_delegate(NULL); | 101 tab_contents->tab_contents()->set_delegate(NULL); |
102 tab_contents->blocked_content_tab_helper()->set_delegate(NULL); | 102 tab_contents->blocked_content_tab_helper()->set_delegate(NULL); |
103 delete tab_contents; | 103 delete tab_contents; |
104 } | 104 } |
105 blocked_contents_.clear(); | 105 blocked_contents_.clear(); |
106 } | 106 } |
107 | 107 |
108 // Overridden from TabContentsDelegate: | 108 // Overridden from TabContentsDelegate: |
109 | 109 |
110 // TODO(adriansc): Remove this method once refactoring changed all call sites. | |
111 TabContents* BlockedContentContainer::OpenURLFromTab( | |
112 TabContents* source, | |
113 const GURL& url, | |
114 const GURL& referrer, | |
115 WindowOpenDisposition disposition, | |
116 content::PageTransition transition) { | |
117 return owner_->tab_contents()->OpenURL(OpenURLParams(url, | |
118 referrer, | |
119 disposition, | |
120 transition, | |
121 false)); | |
122 } | |
123 | |
124 TabContents* BlockedContentContainer::OpenURLFromTab( | 110 TabContents* BlockedContentContainer::OpenURLFromTab( |
125 TabContents* source, | 111 TabContents* source, |
126 const OpenURLParams& params) { | 112 const OpenURLParams& params) { |
127 return owner_->tab_contents()->OpenURL(params); | 113 return owner_->tab_contents()->OpenURL(params); |
128 } | 114 } |
129 | 115 |
130 void BlockedContentContainer::AddNewContents(TabContents* source, | 116 void BlockedContentContainer::AddNewContents(TabContents* source, |
131 TabContents* new_contents, | 117 TabContents* new_contents, |
132 WindowOpenDisposition disposition, | 118 WindowOpenDisposition disposition, |
133 const gfx::Rect& initial_position, | 119 const gfx::Rect& initial_position, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 bool BlockedContentContainer::ShouldSuppressDialogs() { | 157 bool BlockedContentContainer::ShouldSuppressDialogs() { |
172 // Suppress JavaScript dialogs when inside a constrained popup window (because | 158 // Suppress JavaScript dialogs when inside a constrained popup window (because |
173 // that activates them and breaks them out of the constrained window jail). | 159 // that activates them and breaks them out of the constrained window jail). |
174 return true; | 160 return true; |
175 } | 161 } |
176 | 162 |
177 TabContentsWrapper* BlockedContentContainer::GetConstrainingContentsWrapper( | 163 TabContentsWrapper* BlockedContentContainer::GetConstrainingContentsWrapper( |
178 TabContentsWrapper* source) { | 164 TabContentsWrapper* source) { |
179 return owner_; | 165 return owner_; |
180 } | 166 } |
OLD | NEW |