summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc22
-rw-r--r--chrome/browser/automation/testing_automation_provider.h3
2 files changed, 12 insertions, 13 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index d86ef49..eea9313 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -4167,19 +4167,6 @@ void TestingAutomationProvider::SetExtensionStateById(
service->SetIsIncognitoEnabled(extension->id(), allow_in_incognito);
}
-namespace {
-
-// Selects the given |browser| and |tab| if not selected already.
-void EnsureTabSelected(Browser* browser, WebContents* tab) {
- if (browser->GetSelectedWebContents() != tab ||
- browser != BrowserList::GetLastActive()) {
- browser->ActivateTabAt(browser->GetIndexOfController(&tab->GetController()),
- true /* user_gesture */);
- }
-}
-
-} // namespace
-
// See TriggerPageActionById() in chrome/test/pyautolib/pyauto.py
// for sample json input.
void TestingAutomationProvider::TriggerPageActionById(
@@ -6653,3 +6640,12 @@ void TestingAutomationProvider::OnRemoveProvider() {
if (g_browser_process)
g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
}
+
+void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
+ WebContents* tab) {
+ if (browser->GetSelectedWebContents() != tab ||
+ browser != BrowserList::GetLastActive()) {
+ browser->ActivateTabAt(browser->GetIndexOfController(&tab->GetController()),
+ true /* user_gesture */);
+ }
+}
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index 979e7aa..b5192f7 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -1479,6 +1479,9 @@ class TestingAutomationProvider : public AutomationProvider,
const string16& frame_xpath, const string16& script,
IPC::Message* reply_message, content::RenderViewHost* render_view_host);
+ // Selects the given |browser| and |tab| if not selected already.
+ void EnsureTabSelected(Browser* browser, content::WebContents* tab);
+
#if defined(OS_CHROMEOS)
// Avoid scoped ptr here to avoid having to define it completely in the
// non-ChromeOS code.