Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/ui/views/tab_contents/tab_contents_container.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/views/tab_contents/tab_contents_container.h"
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 
 using content::WebContents;
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, public:
 
 TabContentsContainer::TabContentsContainer()
     : native_container_(NULL),
-      tab_contents_(NULL) {
+      web_contents_(NULL) {
   set_id(VIEW_ID_TAB_CONTAINER);
 }
 
 TabContentsContainer::~TabContentsContainer() {
-  if (tab_contents_)
+  if (web_contents_)
     RemoveObservers();
 }
 
-void TabContentsContainer::ChangeTabContents(TabContents* contents) {
-  if (tab_contents_) {
-    native_container_->DetachContents(tab_contents_);
-    tab_contents_->WasHidden();
+void TabContentsContainer::ChangeWebContents(WebContents* contents) {
+  if (web_contents_) {
+    native_container_->DetachContents(web_contents_);
+    web_contents_->WasHidden();
     RemoveObservers();
   }
-  tab_contents_ = contents;
-  // When detaching the last tab of the browser ChangeTabContents is invoked
+  web_contents_ = contents;
+  // When detaching the last tab of the browser ChangeWebContents is invoked
   // with NULL. Don't attempt to do anything in that case.
-  if (tab_contents_) {
-    RenderWidgetHostViewChanged(tab_contents_->GetRenderWidgetHostView());
-    native_container_->AttachContents(tab_contents_);
+  if (web_contents_) {
+    RenderWidgetHostViewChanged(web_contents_->GetRenderWidgetHostView());
+    native_container_->AttachContents(web_contents_);
     AddObservers();
   }
 }
 
 content::WebContents* TabContentsContainer::web_contents() {
-  return tab_contents_;
+  return web_contents_;
 }
 
 void TabContentsContainer::WebContentsFocused(WebContents* contents) {
   native_container_->WebContentsFocused(contents);
 }
 
 void TabContentsContainer::SetFastResize(bool fast_resize) {
   native_container_->SetFastResize(fast_resize);
 }
 
 void TabContentsContainer::SetReservedContentsRect(
     const gfx::Rect& reserved_rect) {
   cached_reserved_rect_ = reserved_rect;
-  if (tab_contents_ && tab_contents_->GetRenderWidgetHostView()) {
-    tab_contents_->GetRenderWidgetHostView()->set_reserved_contents_rect(
+  if (web_contents_ && web_contents_->GetRenderWidgetHostView()) {
+    web_contents_->GetRenderWidgetHostView()->set_reserved_contents_rect(
         reserved_rect);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, content::NotificationObserver implementation:
 
 void TabContentsContainer::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 26 matching lines @@
     }
   }
 }
 
 void TabContentsContainer::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 #if defined(HAVE_XINPUT2)
 bool TabContentsContainer::OnMousePressed(const views::MouseEvent& event) {
-  DCHECK(tab_contents_);
+  DCHECK(web_contents_);
   if (event.flags() & (ui::EF_LEFT_MOUSE_BUTTON |
                        ui::EF_RIGHT_MOUSE_BUTTON |
                        ui::EF_MIDDLE_MOUSE_BUTTON)) {
     return false;
   }
   // It is necessary to look at the native event to determine what special
   // button was pressed.
   views::NativeEvent native_event = event.native_event();
   if (!native_event)
     return false;
 
   int button = 0;
   switch (native_event->type) {
     case ButtonPress: {
       button = native_event->xbutton.button;
       break;
     }
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
       button = xievent->detail;
       break;
     }
     default:
       break;
   }
   switch (button) {
     case 8:
-      tab_contents_->GetController().GoBack();
+      web_contents_->GetController().GoBack();
       return true;
     case 9:
-      tab_contents_->GetController().GoForward();
+      web_contents_->GetController().GoForward();
       return true;
   }
 
   return false;
 }
 #endif
 
 void TabContentsContainer::ViewHierarchyChanged(bool is_add,
                                                 views::View* parent,
                                                 views::View* child) {
   if (is_add && child == this) {
     native_container_ = NativeTabContentsContainer::CreateNativeContainer(this);
     AddChildView(native_container_->GetView());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, private:
 
 void TabContentsContainer::AddObservers() {
   // TabContents can change their RenderViewHost and hence the HWND that is
   // shown and getting focused.  We need to keep track of that so we install
   // the focus subclass on the shown HWND so we intercept focus change events.
   registrar_.Add(
       this,
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<NavigationController>(&tab_contents_->GetController()));
+      content::Source<NavigationController>(&web_contents_->GetController()));
 
   registrar_.Add(
       this,
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
-      content::Source<WebContents>(tab_contents_));
+      content::Source<WebContents>(web_contents_));
 }
 
 void TabContentsContainer::RemoveObservers() {
   registrar_.RemoveAll();
 }
 
 void TabContentsContainer::RenderViewHostChanged(RenderViewHost* old_host,
                                                  RenderViewHost* new_host) {
   if (new_host)
     RenderWidgetHostViewChanged(new_host->view());
   native_container_->RenderViewHostChanged(old_host, new_host);
 }
 
 void TabContentsContainer::TabContentsDestroyed(WebContents* contents) {
   // Sometimes, a TabContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
-  DCHECK(contents == tab_contents_);
-  ChangeTabContents(NULL);
+  DCHECK(contents == web_contents_);
+  ChangeWebContents(NULL);
 }
 
 void TabContentsContainer::RenderWidgetHostViewChanged(
     RenderWidgetHostView* new_view) {
   if (new_view)
     new_view->set_reserved_contents_rect(cached_reserved_rect_);
 }