Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 16045005: Migrate auto_tests about proxy configuration to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/automation/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1823 matching lines...) Expand 10 before | Expand all | Expand 10 after
1834 handler_map_["SetReleaseTrack"] = 1834 handler_map_["SetReleaseTrack"] =
1835 &TestingAutomationProvider::SetReleaseTrack; 1835 &TestingAutomationProvider::SetReleaseTrack;
1836 1836
1837 handler_map_["GetVolumeInfo"] = &TestingAutomationProvider::GetVolumeInfo; 1837 handler_map_["GetVolumeInfo"] = &TestingAutomationProvider::GetVolumeInfo;
1838 handler_map_["SetVolume"] = &TestingAutomationProvider::SetVolume; 1838 handler_map_["SetVolume"] = &TestingAutomationProvider::SetVolume;
1839 handler_map_["SetMute"] = &TestingAutomationProvider::SetMute; 1839 handler_map_["SetMute"] = &TestingAutomationProvider::SetMute;
1840 1840
1841 handler_map_["OpenCrosh"] = &TestingAutomationProvider::OpenCrosh; 1841 handler_map_["OpenCrosh"] = &TestingAutomationProvider::OpenCrosh;
1842 handler_map_["SetProxySettings"] = 1842 handler_map_["SetProxySettings"] =
1843 &TestingAutomationProvider::SetProxySettings; 1843 &TestingAutomationProvider::SetProxySettings;
1844 handler_map_["GetProxySettings"] =
1845 &TestingAutomationProvider::GetProxySettings;
1846 handler_map_["SetSharedProxies"] = 1844 handler_map_["SetSharedProxies"] =
1847 &TestingAutomationProvider::SetSharedProxies; 1845 &TestingAutomationProvider::SetSharedProxies;
1848 handler_map_["RefreshInternetDetails"] =
1849 &TestingAutomationProvider::RefreshInternetDetails;
1850 1846
1851 browser_handler_map_["GetTimeInfo"] = 1847 browser_handler_map_["GetTimeInfo"] =
1852 &TestingAutomationProvider::GetTimeInfo; 1848 &TestingAutomationProvider::GetTimeInfo;
1853 #endif // defined(OS_CHROMEOS) 1849 #endif // defined(OS_CHROMEOS)
1854 1850
1855 browser_handler_map_["DisablePlugin"] = 1851 browser_handler_map_["DisablePlugin"] =
1856 &TestingAutomationProvider::DisablePlugin; 1852 &TestingAutomationProvider::DisablePlugin;
1857 browser_handler_map_["EnablePlugin"] = 1853 browser_handler_map_["EnablePlugin"] =
1858 &TestingAutomationProvider::EnablePlugin; 1854 &TestingAutomationProvider::EnablePlugin;
1859 browser_handler_map_["GetPluginsInfo"] = 1855 browser_handler_map_["GetPluginsInfo"] =
(...skipping 3830 matching lines...) Expand 10 before | Expand all | Expand 10 after
5690 if (g_browser_process) 5686 if (g_browser_process)
5691 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); 5687 g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
5692 } 5688 }
5693 5689
5694 void TestingAutomationProvider::EnsureTabSelected(Browser* browser, 5690 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
5695 WebContents* tab) { 5691 WebContents* tab) {
5696 TabStripModel* tab_strip = browser->tab_strip_model(); 5692 TabStripModel* tab_strip = browser->tab_strip_model();
5697 if (tab_strip->GetActiveWebContents() != tab) 5693 if (tab_strip->GetActiveWebContents() != tab)
5698 tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true); 5694 tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
5699 } 5695 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698