TabContentsWrapper -> TabContents, part 35.

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 3182 matching lines @@
                                              user_gesture);
       return;
     }
 
     // Handle blocking of popups.
     if ((disposition == NEW_POPUP) && !user_gesture &&
         !CommandLine::ForCurrentProcess()->HasSwitch(
             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;
     }
 
     new_contents->GetRenderViewHost()->DisassociateFromPopupCount();
   }
 
   browser::NavigateParams params(this, new_tab_contents);
   params.source_contents = source ?
@@ skipping 199 matching lines @@
 }
 
 int Browser::GetExtraRenderViewHeight() const {
   return window_->GetExtraRenderViewHeight();
 }
 
 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();
     constrained_tab->GetDelegate()->OnStartDownload(constrained_tab, download);
     return;
   }
 
   if (!window())
     return;
 
@@ skipping 280 matching lines @@
   }
   tab_strip_model_->SetTabBlocked(index, blocked);
   UpdatePrintingState(tab_contents->web_contents()->GetContentRestrictions());
   if (!blocked && GetActiveTabContents() == tab_contents)
     tab_contents->web_contents()->Focus();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BlockedContentTabHelperDelegate implementation:
 
-TabContents* Browser::GetConstrainingContentsWrapper(TabContents* source) {
+TabContents* Browser::GetConstrainingTabContents(TabContents* source) {
   return source;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BookmarkTabHelperDelegate implementation:
 
 void Browser::URLStarredChanged(TabContents* source, bool starred) {
   if (source == GetActiveTabContents())
     window_->SetStarredState(starred);
 }
@@ skipping 1437 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }