Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

 // Copyright (c) 2012 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/extensions/extension_action_context_menu.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 66 matching lines @@
   kExtensionContextDisable = 3,
   kExtensionContextUninstall = 4,
   kExtensionContextHide = 5,
   kExtensionContextManage = 7,
 };
 
 int CurrentTabId() {
   Browser* browser = browser::GetLastActiveBrowser();
   if(!browser)
     return -1;
-  WebContents* contents = browser->GetActiveWebContents();
+  WebContents* contents = chrome::GetActiveWebContents(browser);
   if (!contents)
     return -1;
   return ExtensionTabUtil::GetTabId(contents);
 }
 
 }  // namespace
 
 - (id)initWithExtension:(const Extension*)extension
                 profile:(Profile*)profile
         extensionAction:(ExtensionAction*)action{
@@ skipping 93 matching lines @@
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
   if ([menuItem tag] == kExtensionContextOptions) {
     // Disable 'Options' if there are no options to set.
     return extension_->options_url().spec().length() > 0;
   }
   return YES;
 }
 
 @end