TabContentsWrapper -> TabContents, part 13.

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 3113 matching lines @@
   return BrowserWindow::CreateBrowserWindow(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, content::WebContentsDelegate implementation:
 
 WebContents* Browser::OpenURLFromTab(WebContents* source,
                                      const OpenURLParams& params) {
   browser::NavigateParams nav_params(this, params.url, params.transition);
   nav_params.source_contents = GetTabContentsAt(
-      tab_strip_model_->GetWrapperIndex(source));
+      tab_strip_model_->GetIndexOfWebContents(source));
   nav_params.referrer = params.referrer;
   nav_params.disposition = params.disposition;
   nav_params.tabstrip_add_types = TabStripModel::ADD_NONE;
   nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
   nav_params.user_gesture = true;
   nav_params.override_encoding = params.override_encoding;
   nav_params.is_renderer_initiated = params.is_renderer_initiated;
   nav_params.transferred_global_request_id =
       params.transferred_global_request_id;
   browser::Navigate(&nav_params);
@@ skipping 60 matching lines @@
           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 ?
-      GetTabContentsAt(tab_strip_model_->GetWrapperIndex(source)): NULL;
+      GetTabContentsAt(tab_strip_model_->GetIndexOfWebContents(source)): NULL;
   params.disposition = disposition;
   params.window_bounds = initial_pos;
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
   params.user_gesture = user_gesture;
   browser::Navigate(&params);
 }
 
 void Browser::ActivateContents(WebContents* contents) {
-  ActivateTabAt(tab_strip_model_->GetWrapperIndex(contents), false);
+  ActivateTabAt(tab_strip_model_->GetIndexOfWebContents(contents), false);
   window_->Activate();
 }
 
 void Browser::DeactivateContents(WebContents* contents) {
   window_->Deactivate();
 }
 
 void Browser::LoadingStateChanged(WebContents* source) {
   window_->UpdateLoadingAnimations(tab_strip_model_->TabsAreLoading());
   window_->UpdateTitleBar();
@@ skipping 26 matching lines @@
 void Browser::CloseContents(WebContents* source) {
   if (is_attempting_to_close_browser_) {
     // If we're trying to close the browser, just clear the state related to
     // waiting for unload to fire. Don't actually try to close the tab as it
     // will go down the slow shutdown path instead of the fast path of killing
     // all the renderer processes.
     ClearUnloadState(source, true);
     return;
   }
 
-  int index = tab_strip_model_->GetWrapperIndex(source);
+  int index = tab_strip_model_->GetIndexOfWebContents(source);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED() << "CloseContents called for tab not in our strip";
     return;
   }
   tab_strip_model_->CloseTabContentsAt(index,
       TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);
 }
 
 void Browser::MoveContents(WebContents* source, const gfx::Rect& pos) {
   if (!IsPopupOrPanel(source)) {
     NOTREACHED() << "moving invalid browser type";
     return;
   }
   window_->SetBounds(pos);
 }
 
 void Browser::DetachContents(WebContents* source) {
-  int index = tab_strip_model_->GetWrapperIndex(source);
+  int index = tab_strip_model_->GetIndexOfWebContents(source);
   if (index >= 0)
     tab_strip_model_->DetachTabContentsAt(index);
 }
 
 bool Browser::IsPopupOrPanel(const WebContents* source) const {
   // A non-tabbed BROWSER is an unconstrained popup.
   return is_type_popup() || is_type_panel();
 }
 
 bool Browser::CanReloadContents(WebContents* source) const {
@@ skipping 153 matching lines @@
   }
 
   // If the download occurs in a new tab, close it.
   if (source->GetController().IsInitialNavigation() && tab_count() > 1)
     CloseContents(source);
 }
 
 void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) {
   DCHECK(source);
   TabContents* tab_contents = GetTabContentsAt(
-      tab_strip_model_->GetWrapperIndex(source));
+      tab_strip_model_->GetIndexOfWebContents(source));
   ViewSource(tab_contents);
 }
 
 void Browser::ViewSourceForFrame(WebContents* source,
                                  const GURL& frame_url,
                                  const std::string& frame_content_state) {
   DCHECK(source);
   TabContents* tab_contents = GetTabContentsAt(
-      tab_strip_model_->GetWrapperIndex(source));
+      tab_strip_model_->GetIndexOfWebContents(source));
   ViewSource(tab_contents, frame_url, frame_content_state);
 }
 
 void Browser::ShowRepostFormWarningDialog(WebContents* source) {
   browser::ShowTabModalConfirmDialog(
       new RepostFormWarningController(source),
       TabContents::GetOwningTabContentsForWebContents(source));
 }
 
 bool Browser::ShouldAddNavigationToHistory(
@@ skipping 1059 matching lines @@
             web_app::IsValidUrl(contents->GetURL()));
 #endif
         window_->UpdateTitleBar();
       }
     }
 
     // Updates that don't depend upon the selected state go here.
     if (flags &
         (content::INVALIDATE_TYPE_TAB | content::INVALIDATE_TYPE_TITLE)) {
       tab_strip_model_->UpdateTabContentsStateAt(
-          tab_strip_model_->GetWrapperIndex(contents),
+          tab_strip_model_->GetIndexOfWebContents(contents),
           TabStripModelObserver::ALL);
     }
 
     // We don't need to process INVALIDATE_STATE, since that's not visible.
   }
 
   scheduled_updates_.clear();
 }
 
 void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ skipping 610 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;
 }