summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/testing_automation_provider.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 05:53:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 05:53:20 +0000
commit4ca153033f022dc6e11d6094daed41b1ed0a995f (patch)
treef4720517b10953166f84707ca3ec8b82de860884 /chrome/browser/automation/testing_automation_provider.cc
parent08bd3d71d969061b1588e6a4210f6d74b0ec0c6d (diff)
downloadchromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.zip
chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.gz
chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.bz2
Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review.
I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type. BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/9015022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider.cc')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 8650080..f7f59ae 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -3538,7 +3538,7 @@ void TestingAutomationProvider::OmniboxAcceptInput(
DictionaryValue* args,
IPC::Message* reply_message) {
NavigationController& controller =
- browser->GetSelectedTabContents()->GetController();
+ browser->GetSelectedWebContents()->GetController();
new OmniboxAcceptNotificationObserver(&controller, this, reply_message);
browser->window()->GetLocationBar()->AcceptInput();
}
@@ -5846,7 +5846,7 @@ void TestingAutomationProvider::LaunchApp(
service->extension_prefs()->GetLaunchContainer(
extension, ExtensionPrefs::LAUNCH_REGULAR);
- TabContents* old_contents = browser->GetSelectedTabContents();
+ WebContents* old_contents = browser->GetSelectedWebContents();
if (!old_contents) {
AutomationJSONReply(this, reply_message).SendError(
"Cannot identify selected tab contents.");