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

Unified Diff: chrome_frame/chrome_frame_automation.cc

Issue 6756044: Remove extension automation support that was used only by CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head. Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_automation.h ('k') | chrome_frame/chrome_frame_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_automation.cc
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index c3e101b492089cfc0bbccafd3368a14c23e6e265..d3626ebfce27e3b027bd122351c3ecbdc1fea6a3 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -120,15 +120,6 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher
case AutomationMsg_NavigateInExternalTab::ID:
InvokeCallback<BeginNavigateContext>(msg, context);
break;
- case AutomationMsg_InstallExtension::ID:
- InvokeCallback<InstallExtensionContext>(msg, context);
- break;
- case AutomationMsg_LoadExpandedExtension::ID:
- InvokeCallback<InstallExtensionContext>(msg, context);
- break;
- case AutomationMsg_GetEnabledExtensions::ID:
- InvokeCallback<GetEnabledExtensionsContext>(msg, context);
- break;
case AutomationMsg_RunUnloadHandlers::ID:
InvokeCallback<UnloadContext>(msg, context);
break;
@@ -849,69 +840,6 @@ void ChromeFrameAutomationClient::FindInPage(const std::wstring& search_string,
automation_server_->SendAsAsync(msg, NULL, this);
}
-void ChromeFrameAutomationClient::InstallExtension(
- const FilePath& crx_path,
- void* user_data) {
- if (automation_server_ == NULL) {
- InstallExtensionComplete(crx_path,
- user_data,
- AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
- return;
- }
-
- InstallExtensionContext* ctx = new InstallExtensionContext(
- this, crx_path, user_data);
-
- IPC::SyncMessage* msg = new AutomationMsg_InstallExtension(crx_path, NULL);
-
- // The context will delete itself after it is called.
- automation_server_->SendAsAsync(msg, ctx, this);
-}
-
-void ChromeFrameAutomationClient::InstallExtensionComplete(
- const FilePath& crx_path,
- void* user_data,
- AutomationMsg_ExtensionResponseValues res) {
- DCHECK_EQ(base::PlatformThread::CurrentId(), ui_thread_id_);
-
- if (chrome_frame_delegate_) {
- chrome_frame_delegate_->OnExtensionInstalled(crx_path, user_data, res);
- }
-}
-
-void ChromeFrameAutomationClient::GetEnabledExtensions(void* user_data) {
- if (automation_server_ == NULL) {
- GetEnabledExtensionsComplete(user_data, &std::vector<FilePath>());
- return;
- }
-
- GetEnabledExtensionsContext* ctx = new GetEnabledExtensionsContext(
- this, user_data);
-
- IPC::SyncMessage* msg = new AutomationMsg_GetEnabledExtensions(
- ctx->extension_directories());
-
- // The context will delete itself after it is called.
- automation_server_->SendAsAsync(msg, ctx, this);
-}
-
-void ChromeFrameAutomationClient::GetEnabledExtensionsComplete(
- void* user_data,
- std::vector<FilePath>* extension_directories) {
- DCHECK_EQ(base::PlatformThread::CurrentId(), ui_thread_id_);
-
- if (chrome_frame_delegate_) {
- chrome_frame_delegate_->OnGetEnabledExtensionsComplete(
- user_data, *extension_directories);
- }
-
- delete extension_directories;
-}
-
-int ChromeFrameAutomationClient::GetSessionId() const {
- return session_id_;
-}
-
void ChromeFrameAutomationClient::OnChromeFrameHostMoved() {
// Use a local var to avoid the small possibility of getting the tab_
// member be cleared while we try to use it.
@@ -923,25 +851,6 @@ void ChromeFrameAutomationClient::OnChromeFrameHostMoved() {
tab->OnHostMoved();
}
-void ChromeFrameAutomationClient::LoadExpandedExtension(
- const FilePath& path,
- void* user_data) {
- if (automation_server_ == NULL) {
- InstallExtensionComplete(path,
- user_data,
- AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
- return;
- }
-
- InstallExtensionContext* ctx = new InstallExtensionContext(
- this, path, user_data);
-
- IPC::SyncMessage* msg = new AutomationMsg_LoadExpandedExtension(path, NULL);
-
- // The context will delete itself after it is called.
- automation_server_->SendAsAsync(msg, ctx, this);
-}
-
void ChromeFrameAutomationClient::CreateExternalTab() {
AutomationLaunchResult launch_result = AUTOMATION_SUCCESS;
DCHECK(IsWindow());
@@ -1000,19 +909,6 @@ AutomationLaunchResult ChromeFrameAutomationClient::CreateExternalTabComplete(
return launch_result;
}
-void ChromeFrameAutomationClient::SetEnableExtensionAutomation(
- const std::vector<std::string>& functions_enabled) {
- if (!is_initialized())
- return;
-
- // We are doing initialization, so there is no need to reset extension
- // automation, only to set it. Also, we want to avoid resetting extension
- // automation that some other automation client has set up. Therefore only
- // send the message if we are going to enable automation of some functions.
- if (!functions_enabled.empty())
- tab_->SetEnableExtensionAutomation(functions_enabled);
-}
-
// Invoked in launch background thread.
void ChromeFrameAutomationClient::LaunchComplete(
ChromeFrameAutomationProxy* proxy,
« no previous file with comments | « chrome_frame/chrome_frame_automation.h ('k') | chrome_frame/chrome_frame_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698