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

chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
 #include "base/memory/scoped_nsobject.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/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
+using content::WebContents;
+
 @interface TabContentsController(Private)
 // Forwards frame update to |delegate_| (ResizeNotificationView calls it).
 - (void)tabContentsViewFrameWillChange:(NSRect)frameRect;
 // Notification from TabContents (forwarded by TabContentsNotificationBridge).
 - (void)tabContentsRenderViewHostChanged:(RenderViewHost*)oldHost
                                  newHost:(RenderViewHost*)newHost;
 @end
 
 
 // A supporting C++ bridge object to register for TabContents notifications.
 
 class TabContentsNotificationBridge : public content::NotificationObserver {
  public:
   explicit TabContentsNotificationBridge(TabContentsController* controller);
 
   // Overriden from content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
   // Register for |contents|'s notifications, remove all prior registrations.
-  void ChangeTabContents(TabContents* contents);
+  void ChangeWebContents(WebContents* contents);
  private:
   content::NotificationRegistrar registrar_;
   TabContentsController* controller_;  // weak, owns us
 };
 
 TabContentsNotificationBridge::TabContentsNotificationBridge(
     TabContentsController* controller)
     : controller_(controller) {
 }
 
 void TabContentsNotificationBridge::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     RenderViewHostSwitchedDetails* switched_details =
         content::Details<RenderViewHostSwitchedDetails>(details).ptr();
     [controller_ tabContentsRenderViewHostChanged:switched_details->old_host
                                           newHost:switched_details->new_host];
   } else {
     NOTREACHED();
   }
 }
 
-void TabContentsNotificationBridge::ChangeTabContents(TabContents* contents) {
+void TabContentsNotificationBridge::ChangeWebContents(WebContents* contents) {
   registrar_.RemoveAll();
   if (contents) {
     registrar_.Add(
         this,
         content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
         content::Source<NavigationController>(&contents->GetController()));
   }
 }
 
 
@@ skipping 24 matching lines @@
 
 @implementation TabContentsController
 @synthesize tabContents = contents_;
 
 - (id)initWithContents:(TabContents*)contents
               delegate:(id<TabContentsControllerDelegate>)delegate {
   if ((self = [super initWithNibName:nil bundle:nil])) {
     contents_ = contents;
     delegate_ = delegate;
     tabContentsBridge_.reset(new TabContentsNotificationBridge(self));
-    tabContentsBridge_->ChangeTabContents(contents);
+    tabContentsBridge_->ChangeWebContents(contents);
   }
   return self;
 }
 
 - (void)dealloc {
   // make sure our contents have been removed from the window
   [[self view] removeFromSuperview];
   [super dealloc];
 }
 
@@ skipping 38 matching lines @@
                                  with:contentsNativeView];
   }
   // Restore autoresizing properties possibly stripped by
   // ensureContentsSizeDoesNotChange call.
   [contentsNativeView setAutoresizingMask:NSViewWidthSizable|
                                           NSViewHeightSizable];
 }
 
 - (void)changeTabContents:(TabContents*)newContents {
   contents_ = newContents;
-  tabContentsBridge_->ChangeTabContents(contents_);
+  tabContentsBridge_->ChangeWebContents(contents_);
 }
 
 - (void)tabContentsViewFrameWillChange:(NSRect)frameRect {
   [delegate_ tabContentsViewFrameWillChange:self frameRect:frameRect];
 }
 
 - (void)tabContentsRenderViewHostChanged:(RenderViewHost*)oldHost
                                  newHost:(RenderViewHost*)newHost {
   if (oldHost && newHost && oldHost->view() && newHost->view()) {
     newHost->view()->set_reserved_contents_rect(
@@ skipping 24 matching lines @@
   // the view may have, so avoid changing the view hierarchy unless
   // the view is different.
   if ([self tabContents] != updatedContents) {
     [self changeTabContents:updatedContents];
     if ([self tabContents])
       [self ensureContentsVisible];
   }
 }
 
 @end