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

chrome/browser/dom_ui/filebrowse_ui.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/dom_ui/filebrowse_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_navigator.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/mediaplayer_ui.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 655 matching lines @@
 
 void FilebrowseHandler::OpenNewPopupWindow(const ListValue* args) {
   OpenNewWindow(args, true);
 }
 
 void FilebrowseHandler::OpenNewWindow(const ListValue* args, bool popup) {
   std::string url = WideToUTF8(ExtractStringValue(args));
   Browser* browser = popup ?
       Browser::CreateForType(Browser::TYPE_APP_PANEL, profile_) :
       BrowserList::GetLastActive();
-  Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
-  browser->AddTabWithURL(&params);
+  browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
+  params.disposition = NEW_FOREGROUND_TAB;
+  browser::Navigate(&params);
+  // TODO(beng): The following two calls should be automatic by Navigate().
   if (popup) {
     // TODO(dhg): Remove these from being hardcoded. Allow javascript
     // to specify.
-    params.target->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
+    params.browser->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
   }
-  params.target->window()->Show();
+  params.browser->window()->Show();
 }
 
 void FilebrowseHandler::SendPicasawebRequest() {
 #if defined(OS_CHROMEOS)
   chromeos::UserManager* user_man = chromeos::UserManager::Get();
   std::string username = user_man->logged_in_user().email();
 
   if (username.empty()) {
     LOG(ERROR) << "Unable to get username";
     return;
@@ skipping 337 matching lines @@
   if (browser == NULL) {
     browser = Browser::CreateForType(Browser::TYPE_APP_PANEL, profile);
     std::string url;
     if (hashArgument.empty()) {
       url = chrome::kChromeUIFileBrowseURL;
     } else {
       url = kFilebrowseURLHash;
       url.append(hashArgument);
     }
 
-    Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
-    browser->AddTabWithURL(&params);
-    params.target->window()->SetBounds(gfx::Rect(kPopupLeft,
-                                                 kPopupTop,
-                                                 width,
-                                                 height));
+    browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
+    params.disposition = NEW_FOREGROUND_TAB;
+    browser::Navigate(&params);
+    // TODO(beng): The following two calls should be automatic by Navigate().
+    params.browser->window()->SetBounds(gfx::Rect(kPopupLeft,
+                                                  kPopupTop,
+                                                  width,
+                                                  height));
 
-    params.target->window()->Show();
+    params.browser->window()->Show();
   } else {
     browser->window()->Show();
   }
 
   return browser;
 }
 
 Browser* FileBrowseUI::GetPopupForPath(const std::string& path,
                                        Profile* profile) {
   std::string current_path = path;
@@ skipping 34 matching lines @@
     }
   }
 
   return NULL;
 }
 
 const int FileBrowseUI::kPopupWidth = 250;
 const int FileBrowseUI::kPopupHeight = 300;
 const int FileBrowseUI::kSmallPopupWidth = 250;
 const int FileBrowseUI::kSmallPopupHeight = 50;