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

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.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/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 35 matching lines @@
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 
 using content::PageNavigator;
 using content::UserMetricsAction;
+using content::WebContents;
 
 namespace {
 
 // The showing height of the bar.
 const int kBookmarkBarHeight = 29;
 
 // Padding for when the bookmark bar is detached.
 const int kTopBottomNTPPadding = 12;
 const int kLeftRightNTPPadding = 8;
 
@@ skipping 605 matching lines @@
     gtk_widget_queue_draw(event_box_.get());
   }
 }
 
 bool BookmarkBarGtk::GetTabContentsSize(gfx::Size* size) {
   Browser* browser = browser_;
   if (!browser) {
     NOTREACHED();
     return false;
   }
-  TabContents* tab_contents = browser->GetSelectedTabContents();
-  if (!tab_contents) {
+  WebContents* web_contents = browser->GetSelectedWebContents();
+  if (!web_contents) {
     // It is possible to have a browser but no TabContents while under testing,
     // so don't NOTREACHED() and error the program.
     return false;
   }
-  if (!tab_contents->GetView()) {
+  if (!web_contents->GetView()) {
     NOTREACHED();
     return false;
   }
-  *size = tab_contents->GetView()->GetContainerSize();
+  *size = web_contents->GetView()->GetContainerSize();
   return true;
 }
 
 void BookmarkBarGtk::StartThrobbingAfterAllocation(GtkWidget* item) {
   g_signal_connect_after(
       item, "size-allocate", G_CALLBACK(OnItemAllocateThunk), this);
 }
 
 void BookmarkBarGtk::OnItemAllocate(GtkWidget* item,
                                     GtkAllocation* allocation) {
@@ skipping 737 matching lines @@
 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() {
   GtkDestDefaults dest_defaults =
       *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL :
                                  GTK_DEST_DEFAULT_DROP;
   gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction);
   gtk_drag_dest_set(other_bookmarks_button_, dest_defaults,
                     NULL, 0, kDragAction);
   ui::SetDestTargetList(overflow_button_, kDestTargetList);
   ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList);
 }