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

Unified Diff: chrome/browser/ui/browser.cc

Issue 10536092: TabContentsWrapper -> TabContents, part 35. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missed one Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 4dcf03de3965141a3f0e399a302a055579051305..23092ac59afe0b9100e439311850e8d4b0b1bcbc 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3200,7 +3200,7 @@ void Browser::AddNewContents(WebContents* source,
switches::kDisablePopupBlocking)) {
// Unrequested popups from normal pages are constrained unless they're in
// the whitelist. The popup owner will handle checking this.
- GetConstrainingContentsWrapper(source_tab_contents)->
+ GetConstrainingTabContents(source_tab_contents)->
blocked_content_tab_helper()->
AddPopup(new_tab_contents, initial_pos, user_gesture);
return;
@@ -3420,7 +3420,7 @@ void Browser::OnStartDownload(WebContents* source,
content::DownloadItem* download) {
TabContents* tab_contents =
TabContents::GetOwningTabContentsForWebContents(source);
- TabContents* constrained = GetConstrainingContentsWrapper(tab_contents);
+ TabContents* constrained = GetConstrainingTabContents(tab_contents);
if (constrained != tab_contents) {
// Download in a constrained popup is shown in the tab that opened it.
WebContents* constrained_tab = constrained->web_contents();
@@ -3721,7 +3721,7 @@ void Browser::SetTabContentBlocked(TabContents* tab_contents, bool blocked) {
///////////////////////////////////////////////////////////////////////////////
// Browser, BlockedContentTabHelperDelegate implementation:
-TabContents* Browser::GetConstrainingContentsWrapper(TabContents* source) {
+TabContents* Browser::GetConstrainingTabContents(TabContents* source) {
return source;
}
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698