Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/ui/webui/feedback_ui.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/webui/feedback_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/feedback/feedback_data.h"
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/screenshot_source.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 116 matching lines @@
 
   return signin->GetAuthenticatedUsername();
 }
 
 #endif  // OS_CHROMEOS
 
 // Returns the index of the feedback tab if already open, -1 otherwise
 int GetIndexOfFeedbackTab(Browser* browser) {
   GURL feedback_url(chrome::kChromeUIFeedbackURL);
   for (int i = 0; i < browser->tab_count(); ++i) {
-    WebContents* tab = chrome::GetWebContentsAt(browser, i);
+    WebContents* tab = browser->tab_strip_model()->GetWebContentsAt(i);
     if (tab && tab->GetURL().GetWithEmptyPath() == feedback_url)
       return i;
   }
 
   return -1;
 }
 
 }  // namespace
 
 namespace chrome {
 
 void ShowFeedbackPage(Browser* browser,
                       const std::string& description_template,
                       const std::string& category_tag) {
 #if defined(OS_CHROMEOS)
   // Grab the timestamp before we do anything else - this is crucial to help
   // diagnose some hardware issues.
   base::Time now = base::Time::Now();
   std::string timestamp = base::DoubleToString(now.ToDoubleT());
 #endif
 
   // First check if we're already open (we cannot depend on ShowSingletonTab
   // for this functionality since we need to make *sure* we never get
   // instantiated again while we are open - with singleton tabs, that can
-  // happen)
+  // happen).
   int feedback_tab_index = GetIndexOfFeedbackTab(browser);
   if (feedback_tab_index >= 0) {
-    // Do not refresh screenshot, do not create a new tab
-    chrome::ActivateTabAt(browser, feedback_tab_index, true);
+    // Do not refresh screenshot, do not create a new tab.
+    browser->tab_strip_model()->ActivateTabAt(feedback_tab_index, true);
     return;
   }
 
   std::vector<unsigned char>* last_screenshot_png =
       FeedbackUtil::GetScreenshotPng();
   last_screenshot_png->clear();
 
   gfx::NativeWindow native_window;
   gfx::Rect snapshot_bounds;
 
@@ skipping 232 matching lines @@
   if (custom_page_url.empty()) {
     if (session_id == -1)
       return false;
 
     Browser* browser = browser::FindBrowserWithID(session_id);
     // Sanity checks.
     if (!browser || index >= browser->tab_count())
       return false;
 
     if (index >= 0) {
-      WebContents* target_tab = chrome::GetWebContentsAt(browser, index);
+      WebContents* target_tab =
+          browser->tab_strip_model()->GetWebContentsAt(index);
       if (target_tab)
         target_tab_url_ = target_tab->GetURL().spec();
     }
 
     // Note: We don't need to setup a screenshot source if we're using a
     // custom page URL since we were invoked from JS/an extension, in which
     // case we don't actually have a screenshot anyway.
     SetupScreenshotsSource();
   } else {
     target_tab_url_ = custom_page_url;
@@ skipping 282 matching lines @@
                     screenshot_filepaths.begin() + sort_size,
                     screenshot_filepaths.end(),
                     ScreenshotTimestampComp);
   for (size_t i = 0; i < sort_size; ++i)
     saved_screenshots->push_back(
                     std::string(ScreenshotSource::kScreenshotUrlRoot) +
                     std::string(ScreenshotSource::kScreenshotSaved) +
                     screenshot_filepaths[i]);
 }
 #endif