diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 01:29:20 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 01:29:20 +0000 |
commit | e5d549d8889c0533703211652564bc0a55ec9938 (patch) | |
tree | 1657b37fe9aab6dc719d2f4cc2298c42a8d92e62 /chrome/browser/automation/testing_automation_provider.cc | |
parent | 1f2f300c1767a21a17e1b9ce3acb4b75ae854600 (diff) | |
download | chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.zip chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.tar.gz chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider.cc')
-rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a64aa52..c927544 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -154,6 +154,8 @@ using content::ChildProcessHost; using content::DownloadItem; using content::DownloadManager; using content::PluginService; +using content::OpenURLParams; +using content::Referrer; using content::SSLStatus; using content::WebContents; @@ -632,8 +634,9 @@ void TestingAutomationProvider::NavigateToURLBlockUntilNavigationsComplete( number_of_navigations, false, false); // TODO(darin): avoid conversion to GURL. - browser->OpenURL( - url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED); + OpenURLParams params( + url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); + browser->OpenURL(params); return; } } @@ -666,8 +669,9 @@ void TestingAutomationProvider::NavigationAsyncWithDisposition( if (browser) { // Don't add any listener unless a callback mechanism is desired. // TODO(vibhor): Do this if such a requirement arises in future. - browser->OpenURL( - url, GURL(), disposition, content::PAGE_TRANSITION_TYPED); + OpenURLParams params( + url, Referrer(), disposition, content::PAGE_TRANSITION_TYPED, false); + browser->OpenURL(params); *status = true; } } |