Remove browser::FindTabbedBrowser call in bookmark_utils.cc. All callers, with the exception of met…

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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/tree_node_iterator.h"
 
 #if defined(OS_MACOSX)
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/gtk/custom_drag.h"
 #endif
 
 using base::Time;
 using content::OpenURLParams;
 using content::PageNavigator;
 using content::WebContents;
 
 namespace {
 
-// A PageNavigator implementation that creates a new Browser. This is used when
-// opening a url and there is no Browser open. The Browser is created the first
-// time the PageNavigator method is invoked.
-class NewBrowserPageNavigator : public PageNavigator {
- public:
-  explicit NewBrowserPageNavigator(Profile* profile)
-      : profile_(profile),
-        browser_(NULL) {}
-
-  virtual ~NewBrowserPageNavigator() {
-    if (browser_)
-      browser_->window()->Show();
-  }
-
-  Browser* browser() const { return browser_; }
-
-  virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
-    if (!browser_) {
-      Profile* profile = (params.disposition == OFF_THE_RECORD) ?
-          profile_->GetOffTheRecordProfile() : profile_;
-      browser_ = Browser::Create(profile);
-    }
-
-    OpenURLParams forward_params = params;
-    forward_params.disposition = NEW_FOREGROUND_TAB;
-    return browser_->OpenURL(forward_params);
-  }
-
- private:
-  Profile* profile_;
-  Browser* browser_;
-
-  DISALLOW_COPY_AND_ASSIGN(NewBrowserPageNavigator);
-};
-
 void CloneBookmarkNodeImpl(BookmarkModel* model,
                            const BookmarkNodeData::Element& element,
                            const BookmarkNode* parent,
                            int index_to_add_at) {
   if (element.is_url) {
     model->AddURL(parent, index_to_add_at, element.title, element.url);
   } else {
     const BookmarkNode* new_folder = model->AddFolder(parent,
                                                       index_to_add_at,
                                                       element.title);
@@ skipping 263 matching lines @@
   bool was_nested = MessageLoop::current()->IsNested();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   bookmark_pasteboard_helper_mac::StartDrag(profile, nodes, view);
   MessageLoop::current()->SetNestableTasksAllowed(was_nested);
 #elif defined(TOOLKIT_GTK)
   BookmarkDrag::BeginDrag(profile, nodes);
 #endif
 }
 
 void OpenAll(gfx::NativeWindow parent,
-             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 || !chrome::GetActiveWebContents(browser)) {
-      navigator = &navigator_impl;
-    } else {
-      if (initial_disposition != NEW_WINDOW &&
-          initial_disposition != OFF_THE_RECORD) {
-        browser->window()->Activate();
-      }
-      navigator = chrome::GetActiveWebContents(browser);
-    }
-  }
-
   bool opened_url = false;
   for (size_t i = 0; i < nodes.size(); ++i)
     OpenAllImpl(nodes[i], initial_disposition, &navigator, &opened_url);
 }
 
 void OpenAll(gfx::NativeWindow parent,
-             Profile* profile,
              PageNavigator* navigator,
              const BookmarkNode* node,
              WindowOpenDisposition initial_disposition) {
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
-  OpenAll(parent, profile, navigator, nodes, initial_disposition);
+  OpenAll(parent, navigator, nodes, initial_disposition);
 }
 
 void CopyToClipboard(BookmarkModel* model,
                      const std::vector<const BookmarkNode*>& nodes,
                      bool remove_nodes) {
   if (nodes.empty())
     return;
 
   BookmarkNodeData(nodes).WriteToClipboard(NULL);
 
@@ skipping 346 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