commit e5d549d8889c0533703211652564bc0a55ec9938
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 28 01:29:20 2011
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 28 01:29:20 2011
tree 1657b37fe9aab6dc719d2f4cc2298c42a8d92e62
parent 1f2f300c1767a21a17e1b9ce3acb4b75ae854600

Move the PageNavigator interface and GlobalRequestID struct to content\public and put them in the content namespace. Make PageNavigator use WebContents instead of TabContents. While I'm touching all the callers, I've removed the deprecated PageNavigator function and converted users to the new one.

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8991012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115858 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9c38db6..5d2d85a 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -207,7 +207,9 @@
 #endif
 
 using base::TimeDelta;
+using content::OpenURLParams;
 using content::PluginService;
+using content::Referrer;
 using content::SSLStatus;
 using content::UserMetricsAction;
 using content::WebContents;
@@ -1548,8 +1550,9 @@
   if (current_tab && current_tab->ShowingInterstitialPage()) {
     NavigationEntry* entry = current_tab->GetController().GetActiveEntry();
     DCHECK(entry);  // Should exist if interstitial is showing.
-    OpenURL(
-        entry->GetURL(), GURL(), disposition, content::PAGE_TRANSITION_RELOAD);
+    OpenURL(OpenURLParams(
+        entry->GetURL(), Referrer(), disposition,
+        content::PAGE_TRANSITION_RELOAD, false));
     return;
   }
 
@@ -1565,11 +1568,12 @@
 
 void Browser::Home(WindowOpenDisposition disposition) {
   content::RecordAction(UserMetricsAction("Home"));
-  OpenURL(
-      profile_->GetHomePage(), GURL(), disposition,
+  OpenURL(OpenURLParams(
+      profile_->GetHomePage(), Referrer(), disposition,
       content::PageTransitionFromInt(
           content::PAGE_TRANSITION_AUTO_BOOKMARK |
-          content::PAGE_TRANSITION_HOME_PAGE));
+          content::PAGE_TRANSITION_HOME_PAGE),
+      false));
 }
 
 void Browser::OpenCurrentURL() {
@@ -2250,8 +2254,9 @@
 }
 
 void Browser::OpenPrivacyDashboardTabAndActivate() {
-  OpenURL(GURL(kPrivacyDashboardUrl), GURL(),
-          NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+  OpenURL(OpenURLParams(
+      GURL(kPrivacyDashboardUrl), Referrer(),
+      NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   window_->Activate();
 }
 
@@ -2301,8 +2306,9 @@
 }
 
 void Browser::OpenSystemTabAndActivate() {
-  OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(),
-          NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+  OpenURL(OpenURLParams(
+      GURL(chrome::kChromeUISystemInfoURL), Referrer(), NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_LINK, false));
   window_->Activate();
 }
 
@@ -2311,16 +2317,18 @@
           switches::kEnableMobileSetupDialog)) {
     window_->ShowMobileSetup();
   } else {
-    OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(),
-            NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+    OpenURL(OpenURLParams(
+        GURL(chrome::kChromeUIMobileSetupURL), Referrer(), NEW_FOREGROUND_TAB,
+        content::PAGE_TRANSITION_LINK, false));
     window_->Activate();
   }
 }
 #endif
 
 void Browser::OpenPluginsTabAndActivate() {
-  OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(),
-          NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+  OpenURL(OpenURLParams(
+      GURL(chrome::kChromeUIPluginsURL), Referrer(), NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_LINK, false));
   window_->Activate();
 }
 
@@ -3004,18 +3012,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
 
-// TODO(adriansc): Remove this method once refactoring changed all call sites.
-TabContents* Browser::OpenURL(const GURL& url,
-                              const GURL& referrer,
-                              WindowOpenDisposition disposition,
-                              content::PageTransition transition) {
-  // For specifying a referrer, use the version of OpenURL taking OpenURLParams.
-  DCHECK(referrer.is_empty());
-  return OpenURLFromTab(NULL, OpenURLParams(
-      url, content::Referrer(), disposition, transition, false));
-}
-
-TabContents* Browser::OpenURL(const OpenURLParams& params) {
+WebContents* Browser::OpenURL(const OpenURLParams& params) {
   return OpenURLFromTab(NULL, params);
 }
 
@@ -3424,7 +3421,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, content::WebContentsDelegate implementation:
 
-TabContents* Browser::OpenURLFromTab(TabContents* source,
+WebContents* Browser::OpenURLFromTab(WebContents* source,
                                      const OpenURLParams& params) {
   browser::NavigateParams nav_params(this, params.url, params.transition);
   nav_params.source_contents =
@@ -4076,8 +4073,12 @@
 void Browser::FileSelected(const FilePath& path, int index, void* params) {
   profile_->set_last_selected_directory(path.DirName());
   GURL file_url = net::FilePathToFileURL(path);
-  if (!file_url.is_empty())
-    OpenURL(file_url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);
+  if (file_url.is_empty())
+    return;
+
+  OpenURL(OpenURLParams(
+      file_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
+      false));
 }
 
 ///////////////////////////////////////////////////////////////////////////////