diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 19:40:03 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 19:40:03 +0000 |
commit | cfc7a4bbe4053a40d8a253403c1bae4fc845c373 (patch) | |
tree | bb15770f4d9511ed540d0ef0adfd46e0ccd42557 /chrome/browser/automation/automation_provider.cc | |
parent | 81cacede51c21fef6dddc4bccba0d6baba9c5822 (diff) | |
download | chromium_src-cfc7a4bbe4053a40d8a253403c1bae4fc845c373.zip chromium_src-cfc7a4bbe4053a40d8a253403c1bae4fc845c373.tar.gz chromium_src-cfc7a4bbe4053a40d8a253403c1bae4fc845c373.tar.bz2 |
GTTF: Move some more bits of automation code from AutomationProvider to TestingAutomationProvider
BUG=52097
TEST=ui_tests, chrome_frame_tests
Review URL: http://codereview.chromium.org/3354013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider.cc')
-rw-r--r-- | chrome/browser/automation/automation_provider.cc | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index fb06b9a..361cdd2 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -328,8 +328,6 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(AutomationMsg_SetProxyConfig, SetProxyConfig); IPC_MESSAGE_HANDLER(AutomationMsg_PrintAsync, PrintAsync) IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_Find, HandleFindRequest) - IPC_MESSAGE_HANDLER(AutomationMsg_GetPageCurrentEncoding, - GetPageCurrentEncoding) IPC_MESSAGE_HANDLER(AutomationMsg_OverrideEncoding, OverrideEncoding) IPC_MESSAGE_HANDLER(AutomationMsg_SelectAll, SelectAll) IPC_MESSAGE_HANDLER(AutomationMsg_Cut, Cut) @@ -362,12 +360,8 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) { MoveExtensionBrowserAction) IPC_MESSAGE_HANDLER(AutomationMsg_GetExtensionProperty, GetExtensionProperty) - IPC_MESSAGE_HANDLER(AutomationMsg_ShutdownSessionService, - ShutdownSessionService) IPC_MESSAGE_HANDLER(AutomationMsg_SaveAsAsync, SaveAsAsync) - IPC_MESSAGE_HANDLER(AutomationMsg_SetContentSetting, SetContentSetting) IPC_MESSAGE_HANDLER(AutomationMsg_RemoveBrowsingData, RemoveBrowsingData) - IPC_MESSAGE_HANDLER(AutomationMsg_ResetToDefaultTheme, ResetToDefaultTheme) #if defined(OS_WIN) // These are for use with external tabs. IPC_MESSAGE_HANDLER(AutomationMsg_CreateExternalTab, CreateExternalTab) @@ -412,16 +406,6 @@ void AutomationProvider::OnUnhandledMessage() { channel_->Close(); } -void AutomationProvider::ShutdownSessionService(int handle, bool* result) { - if (browser_tracker_->ContainsHandle(handle)) { - Browser* browser = browser_tracker_->GetResource(handle); - browser->profile()->ShutdownSessionService(); - *result = true; - } else { - *result = false; - } -} - // This task just adds another task to the event queue. This is useful if // you want to ensure that any tasks added to the event queue after this one // have already been processed by the time |task| is run. @@ -582,19 +566,6 @@ TabContents* AutomationProvider::GetTabContentsForHandle( } // Gets the current used encoding name of the page in the specified tab. -void AutomationProvider::GetPageCurrentEncoding( - int tab_handle, std::string* current_encoding) { - if (tab_tracker_->ContainsHandle(tab_handle)) { - NavigationController* nav = tab_tracker_->GetResource(tab_handle); - Browser* browser = FindAndActivateTab(nav); - DCHECK(browser); - - if (browser->command_updater()->IsCommandEnabled(IDC_ENCODING_MENU)) - *current_encoding = nav->tab_contents()->encoding(); - } -} - -// Gets the current used encoding name of the page in the specified tab. void AutomationProvider::OverrideEncoding(int tab_handle, const std::string& encoding_name, bool* success) { @@ -992,28 +963,3 @@ void AutomationProvider::SaveAsAsync(int tab_handle) { if (tab_contents) tab_contents->OnSavePage(); } - -void AutomationProvider::SetContentSetting( - int handle, - const std::string& host, - ContentSettingsType content_type, - ContentSetting setting, - bool* success) { - *success = false; - if (browser_tracker_->ContainsHandle(handle)) { - Browser* browser = browser_tracker_->GetResource(handle); - HostContentSettingsMap* map = - browser->profile()->GetHostContentSettingsMap(); - if (host.empty()) { - map->SetDefaultContentSetting(content_type, setting); - } else { - map->SetContentSetting(HostContentSettingsMap::Pattern(host), - content_type, "", setting); - } - *success = true; - } -} - -void AutomationProvider::ResetToDefaultTheme() { - profile_->ClearTheme(); -} |