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

chrome/browser/ui/views/wrench_menu.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/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 27 matching lines @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::UserMetricsAction;
+using content::WebContents;
 using ui::MenuModel;
 using views::CustomButton;
 using views::ImageButton;
 using views::Label;
 using views::MenuConfig;
 using views::MenuItemView;
 using views::TextButton;
 using views::View;
 
 namespace {
@@ skipping 440 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     DCHECK_EQ(content::NOTIFICATION_ZOOM_LEVEL_CHANGED, type);
     UpdateZoomControls();
   }
 
  private:
   void UpdateZoomControls() {
     bool enable_increment = false;
     bool enable_decrement = false;
-    TabContents* selected_tab = menu_->browser_->GetSelectedTabContents();
+    WebContents* selected_tab = menu_->browser_->GetSelectedWebContents();
     int zoom = 100;
     if (selected_tab)
       zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement);
     increment_button_->SetEnabled(enable_increment);
     decrement_button_->SetEnabled(enable_decrement);
     zoom_label_->SetText(
         l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, zoom));
 
     zoom_label_width_ = MaxWidthForZoomLabel();
   }
 
   // Calculates the max width the zoom string can be.
   int MaxWidthForZoomLabel() {
     gfx::Font font = zoom_label_->font();
     gfx::Insets insets;
     if (zoom_label_->border())
       zoom_label_->border()->GetInsets(&insets);
 
     int max_w = 0;
 
-    TabContents* selected_tab = menu_->browser_->GetSelectedTabContents();
+    WebContents* selected_tab = menu_->browser_->GetSelectedWebContents();
     if (selected_tab) {
       int min_percent = selected_tab->GetMinimumZoomPercent();
       int max_percent = selected_tab->GetMaximumZoomPercent();
 
       int step = (max_percent - min_percent) / 10;
       for (int i = min_percent; i <= max_percent; i += step) {
         int w = font.GetStringWidth(
             l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, i));
         max_w = std::max(w, max_w);
       }
@@ skipping 352 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }