Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/bookmarks/bookmark_context_menu_controller.cc

 // 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.
 
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.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_tabstrip.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::PageNavigator;
 using content::UserMetricsAction;
 
@@ skipping 140 matching lines @@
     case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK: {
       content::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Add"));
 
       int index;
       const BookmarkNode* parent =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
       GURL url;
       string16 title;
       bookmark_utils::GetURLAndTitleToBookmark(
-          browser_->GetActiveWebContents(), &url, &title);
+          chrome::GetActiveWebContents(browser_), &url, &title);
       BookmarkEditor::Show(
           parent_window_,
           profile_,
           BookmarkEditor::EditDetails::AddNodeInFolder(
               parent, index, url, title),
           BookmarkEditor::SHOW_TREE);
       break;
     }
 
     case IDC_BOOKMARK_BAR_NEW_FOLDER: {
@@ skipping 130 matching lines @@
     delegate_->CloseMenu();
 }
 
 bool BookmarkContextMenuController::HasURLs() const {
   for (size_t i = 0; i < selection_.size(); ++i) {
     if (bookmark_utils::NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }