Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/bookmarks/bookmark_utils.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_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/history/query_parser.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/browser_window.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
@@ skipping 344 matching lines @@
              Profile* profile,
              PageNavigator* navigator,
              const std::vector<const BookmarkNode*>& nodes,
              WindowOpenDisposition initial_disposition) {
   if (!ShouldOpenAll(parent, nodes))
     return;
 
   NewBrowserPageNavigator navigator_impl(profile);
   if (!navigator) {
     Browser* browser = browser::FindTabbedBrowser(profile, false);
-    if (!browser || !browser->GetActiveWebContents()) {
+    if (!browser || !chrome::GetActiveWebContents(browser)) {
       navigator = &navigator_impl;
     } else {
       if (initial_disposition != NEW_WINDOW &&
           initial_disposition != OFF_THE_RECORD) {
         browser->window()->Activate();
       }
-      navigator = browser->GetActiveWebContents();
+      navigator = chrome::GetActiveWebContents(browser);
     }
   }
 
   bool opened_url = false;
   if (initial_disposition == OFF_THE_RECORD)
     profile = profile->GetOffTheRecordProfile();
 
   for (size_t i = 0; i < nodes.size(); ++i)
     OpenAllImpl(nodes[i], initial_disposition, &navigator, &opened_url);
 }
@@ skipping 250 matching lines @@
                               string16* title) {
   *url = web_contents->GetURL();
   *title = web_contents->GetTitle();
 }
 
 void GetURLsForOpenTabs(
     Browser* browser,
     std::vector<std::pair<GURL, string16> >* urls) {
   for (int i = 0; i < browser->tab_count(); ++i) {
     std::pair<GURL, string16> entry;
-    GetURLAndTitleToBookmark(browser->GetWebContentsAt(i), &(entry.first),
-                             &(entry.second));
+    GetURLAndTitleToBookmark(
+        chrome::GetWebContentsAt(browser, i), &(entry.first),
+        &(entry.second));
     urls->push_back(entry);
   }
 }
 
 const BookmarkNode* GetParentForNewNodes(
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
     int* index) {
   const BookmarkNode* real_parent = parent;
 
@@ skipping 92 matching lines @@
 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) {
   g_bookmark_bar_view_animations_disabled = disabled;
 }
 
 bool IsBookmarkBarViewAnimationsDisabled() {
   return g_bookmark_bar_view_animations_disabled;
 }
 #endif
 
 }  // namespace bookmark_utils