Make all browser code use browser::Navigate to open tabs....

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2010 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/extensions/extension_tabs_module.h"
 
 #include "base/base64.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_navigator.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ skipping 375 matching lines @@
         window_type = Browser::TYPE_NORMAL;
       } else if (type_str == keys::kWindowTypeValuePopup) {
         window_type = Browser::TYPE_APP_POPUP;
       } else {
         EXTENSION_FUNCTION_VALIDATE(false);
       }
     }
   }
 
   Browser* new_window = Browser::CreateForType(window_type, window_profile);
-  for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
-    Browser::AddTabWithURLParams addTabParams =
-        Browser::AddTabWithURLParams(*i, PageTransition::LINK);
-    new_window->AddTabWithURL(&addTabParams);
-  }
+  for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i)
+    new_window->AddSelectedTabWithURL(*i, PageTransition::LINK);
   if (urls.size() == 0)
     new_window->NewTab();
   new_window->SelectNumberedTab(0);
   if (window_type & Browser::TYPE_POPUP)
     new_window->window()->SetBounds(popup_bounds);
   else
     new_window->window()->SetBounds(window_bounds);
   new_window->window()->Show();
 
   if (new_window->profile()->IsOffTheRecord() && !include_incognito()) {
@@ skipping 195 matching lines @@
   if (args->HasKey(keys::kIndexKey))
     EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kIndexKey, &index));
 
   TabStripModel* tab_strip = browser->tabstrip_model();
 
   index = std::min(std::max(index, -1), tab_strip->count());
 
   int add_types = selected ? TabStripModel::ADD_SELECTED :
                              TabStripModel::ADD_NONE;
   add_types |= TabStripModel::ADD_FORCE_INDEX;
-  Browser::AddTabWithURLParams params(url, PageTransition::LINK);
-  params.index = index;
-  params.add_types = add_types;
-  TabContents* contents = browser->AddTabWithURL(&params);
-  index = browser->tabstrip_model()->GetIndexOfTabContents(contents);
+  browser::NavigateParams params(browser, url, PageTransition::LINK);
+  params.disposition = selected ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+  params.tabstrip_index = index;
+  params.tabstrip_add_types = add_types;
+  browser::Navigate(&params);
 
   if (selected)
-    contents->view()->SetInitialFocus();
+    params.target_contents->view()->SetInitialFocus();
 
   // Return data about the newly created tab.
-  if (has_callback())
-    result_.reset(ExtensionTabUtil::CreateTabValue(contents,
-                                                   browser->tabstrip_model(),
-                                                   index));
+  if (has_callback()) {
+    result_.reset(ExtensionTabUtil::CreateTabValue(
+        params.target_contents,
+        params.browser->tabstrip_model(),
+        params.browser->tabstrip_model()->GetIndexOfTabContents(
+            params.target_contents)));
+  }
 
   return true;
 }
 
 bool GetTabFunction::RunImpl() {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
 
   TabStripModel* tab_strip = NULL;
   TabContents* contents = NULL;
@@ skipping 496 matching lines @@
 }
 
 static GURL ResolvePossiblyRelativeURL(std::string url_string,
                                        const Extension* extension) {
   GURL url = GURL(url_string);
   if (!url.is_valid())
     url = extension->GetResourceURL(url_string);
 
   return url;
 }