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

chrome/browser/ui/cocoa/dev_tools_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/dev_tools_controller.h"
 
 #include <algorithm>
 
 #include <Cocoa/Cocoa.h>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
+using content::WebContents;
+
 namespace {
 
 // Minimal height of devtools pane or content pane when devtools are docked
 // to the browser window.
 const int kMinDevToolsHeight = 50;
 const int kMinDevToolsWidth = 150;
 const int kMinContentsSize = 50;
 
 }  // end namespace
 
 
 @interface DevToolsController (Private)
-- (void)showDevToolsContents:(TabContents*)devToolsContents
+- (void)showDevToolsContents:(WebContents*)devToolsContents
                  withProfile:(Profile*)profile;
 - (void)showDevToolsContainer:(Profile*)profile;
 - (void)hideDevToolsContainer:(Profile*)profile;
 - (void)resizeDevTools:(CGFloat)size;
 @end
 
 
 @implementation DevToolsController
 
 - (id)initWithDelegate:(id<TabContentsControllerDelegate>)delegate {
@@ skipping 19 matching lines @@
 }
 
 - (NSView*)view {
   return splitView_.get();
 }
 
 - (NSSplitView*)splitView {
   return splitView_.get();
 }
 
-- (void)updateDevToolsForTabContents:(TabContents*)contents
+- (void)updateDevToolsForWebContents:(WebContents*)contents
                          withProfile:(Profile*)profile {
   // Get current devtools content.
   TabContentsWrapper* devToolsTab = contents ?
       DevToolsWindow::GetDevToolsContents(contents) : NULL;
-  TabContents* devToolsContents = devToolsTab ?
-      devToolsTab->tab_contents() : NULL;
+  WebContents* devToolsContents = devToolsTab ?
+      devToolsTab->web_contents() : NULL;
 
   [self showDevToolsContents:devToolsContents withProfile:profile];
 }
 
 - (void)setDockToRight:(BOOL)dockToRight
            withProfile:(Profile*)profile {
   if (dockToRight_ == dockToRight)
     return;
 
   NSArray* subviews = [splitView_ subviews];
   if ([subviews count] == 2) {
     [self hideDevToolsContainer:profile];
     dockToRight_ = dockToRight;
     [self showDevToolsContainer:profile];
   } else {
     dockToRight_ = dockToRight;
   }
 }
 
 - (void)ensureContentsVisible {
   [contentsController_ ensureContentsVisible];
 }
 
-- (void)showDevToolsContents:(TabContents*)devToolsContents
+- (void)showDevToolsContents:(WebContents*)devToolsContents
                  withProfile:(Profile*)profile {
   [contentsController_ ensureContentsSizeDoesNotChange];
 
   NSArray* subviews = [splitView_ subviews];
   if (devToolsContents) {
     // |devToolsView| is a TabContentsViewCocoa object, whose ViewID was
     // set to VIEW_ID_TAB_CONTAINER initially, so we need to change it to
     // VIEW_ID_DEV_TOOLS_DOCKED here.
     view_id_util::SetID(devToolsContents->GetNativeView(),
                         VIEW_ID_DEV_TOOLS_DOCKED);
     [self showDevToolsContainer:profile];
   } else {
     if ([subviews count] > 1) {
       [self hideDevToolsContainer:profile];
     }
   }
 
-  [contentsController_ changeTabContents:devToolsContents];
+  [contentsController_ changeTabContents:
+      static_cast<TabContents*>(devToolsContents)];
 }
 
 - (void)showDevToolsContainer:(Profile*)profile {
   NSArray* subviews = [splitView_ subviews];
   DCHECK_GE([subviews count], 1u);
 
   CGFloat splitOffset = 0;
 
   CGFloat contentSize =
       dockToRight_ ? NSWidth([splitView_ frame])
@@ skipping 82 matching lines @@
   // Return NO for the devTools view to indicate that it should not be resized
   // automatically. It preserves the height set by the user and also keeps
   // view height the same while changing tabs when one of the tabs shows infobar
   // and others are not.
   if ([[splitView_ subviews] indexOfObject:subview] == 1)
     return NO;
   return YES;
 }
 
 @end