TabContentsWrapper -> TabContents, part 13.

chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
@@ skipping 274 matching lines @@
   // TODO(erikkay): START_PAGE doesn't seem like the right transition in all
   // cases.
   browser::NavigateParams params(browser, extension_url,
                                  content::PAGE_TRANSITION_START_PAGE);
   params.tabstrip_add_types = add_type;
   params.disposition = disposition;
 
   if (disposition == CURRENT_TAB) {
     WebContents* existing_tab = browser->GetSelectedWebContents();
     TabStripModel* model = browser->tab_strip_model();
-    int tab_index = model->GetWrapperIndex(existing_tab);
+    int tab_index = model->GetIndexOfWebContents(existing_tab);
 
     existing_tab->OpenURL(content::OpenURLParams(
           extension_url,
           content::Referrer(existing_tab->GetURL(),
                             WebKit::WebReferrerPolicyDefault),
           disposition, content::PAGE_TRANSITION_LINK, false));
     // Reset existing_tab as OpenURL() may have clobbered it.
     existing_tab = browser->GetSelectedWebContents();
     if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) {
       model->SetTabPinned(tab_index, true);
       // Pinning may have moved the tab.
-      tab_index = model->GetWrapperIndex(existing_tab);
+      tab_index = model->GetIndexOfWebContents(existing_tab);
     }
     if (params.tabstrip_add_types & TabStripModel::ADD_ACTIVE)
       model->ActivateTabAt(tab_index, true);
 
     contents = existing_tab;
   } else {
     browser::Navigate(&params);
     contents = params.target_contents->web_contents();
   }
 
 #if defined(USE_ASH)
   // In ash, LAUNCH_FULLSCREEN launches in a maximized app window and it should
   // not reach here.
   DCHECK(launch_type != ExtensionPrefs::LAUNCH_FULLSCREEN);
 #else
   // TODO(skerner):  If we are already in full screen mode, and the user
   // set the app to open as a regular or pinned tab, what should happen?
   // Today we open the tab, but stay in full screen mode.  Should we leave
   // full screen mode in this case?
   if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN &&
       !browser->window()->IsFullscreen()) {
     browser->ToggleFullscreenMode();
   }
 #endif
 
   return contents;
 }
 
 }  // namespace application_launch