TabContentsWrapper -> TabContents, part 39.

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"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 164 matching lines @@
     else if (launch_type == ExtensionPrefs::LAUNCH_WINDOW)
       params.initial_show_state = ui::SHOW_STATE_NORMAL;
   }
 #endif
 
   Browser* browser = Browser::CreateWithParams(params);
 
   if (app_browser)
     *app_browser = browser;
 
-  TabContentsWrapper* wrapper =
+  TabContents* tab_contents =
       browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_START_PAGE);
-  WebContents* contents = wrapper->web_contents();
+  WebContents* contents = tab_contents->web_contents();
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   // TODO(stevenjb): Find the right centralized place to do this. Currently it
   // is only done for app tabs in normal browsers through SetExtensionAppById.
-  if (extension && type == Browser::TYPE_PANEL)
-    wrapper->extension_tab_helper()->SetExtensionAppIconById(extension->id());
+  if (extension && type == Browser::TYPE_PANEL) {
+    tab_contents->extension_tab_helper()->
+        SetExtensionAppIconById(extension->id());
+  }
 
   browser->window()->Show();
 
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   contents->GetView()->SetInitialFocus();
   return contents;
 }
 
 WebContents* OpenAppShortcutWindow(Profile* profile,
@@ skipping 63 matching lines @@
 
   GURL extension_url = UrlForExtension(extension, override_url);
   // 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();
+    WebContents* existing_tab = browser->GetActiveWebContents();
     TabStripModel* model = browser->tab_strip_model();
     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();
+    existing_tab = browser->GetActiveWebContents();
     if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) {
       model->SetTabPinned(tab_index, true);
       // Pinning may have moved the tab.
       tab_index = model->GetIndexOfWebContents(existing_tab);
     }
     if (params.tabstrip_add_types & TabStripModel::ADD_ACTIVE)
       model->ActivateTabAt(tab_index, true);
 
     contents = existing_tab;
   } else {
@@ skipping 13 matching lines @@
   if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN &&
       !browser->window()->IsFullscreen()) {
     browser->ToggleFullscreenMode();
   }
 #endif
 
   return contents;
 }
 
 }  // namespace application_launch