Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

chrome/browser/ui/browser_list.cc

 // Copyright (c) 2011 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_list.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 #endif
 
+using content::WebContents;
+
 namespace {
 
 // This object is instantiated when the first Browser object is added to the
 // list and delete when the last one is removed. It watches for loads and
 // creates histograms of some global object counts.
 class BrowserActivityObserver : public content::NotificationObserver {
  public:
   BrowserActivityObserver() {
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    content::NotificationService::AllSources());
@@ skipping 689 matching lines @@
        it != BrowserList::end();
        ++it) {
     Browser* browser = *it;
     if (browser->window() && browser->window()->GetNativeHandle() == window)
       return browser;
   }
   return NULL;
 }
 
 // static
-Browser* BrowserList::FindBrowserWithTabContents(TabContents* tab_contents) {
-  DCHECK(tab_contents);
+Browser* BrowserList::FindBrowserWithWebContents(WebContents* web_contents) {
+  DCHECK(web_contents);
   for (TabContentsIterator it; !it.done(); ++it) {
-    if (it->tab_contents() == tab_contents)
+    if (it->web_contents() == web_contents)
       return it.browser();
   }
   return NULL;
 }
 
 // static
 BrowserList::const_reverse_iterator BrowserList::begin_last_active() {
   return last_active_browsers().rbegin();
 }
 
@@ skipping 90 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }