Remove the defunct SetAccelerator message and replace it with an

automation message to set initial settings.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/155376

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20676 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 38 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 49bd64f..36e348d 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -999,8 +999,6 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(AutomationMsg_HideInterstitialPage,
                         HideInterstitialPage)
 #if defined(OS_WIN)
-    IPC_MESSAGE_HANDLER(AutomationMsg_SetAcceleratorsForTab,
-                        SetAcceleratorsForTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator,
                         ProcessUnhandledAccelerator)
 #endif
@@ -2383,20 +2381,19 @@ void AutomationProvider::CloseBrowserAsync(int browser_handle) {
 
 #if defined(OS_WIN)
 // TODO(port): Remove windowsisms.
-void AutomationProvider::CreateExternalTab(HWND parent,
-                                           const gfx::Rect& dimensions,
-                                           unsigned int style,
-                                           bool incognito,
-                                           HWND* tab_container_window,
-                                           HWND* tab_window,
-                                           int* tab_handle) {
+void AutomationProvider::CreateExternalTab(
+    const IPC::ExternalTabSettings& settings,
+    gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
+    int* tab_handle) {
   *tab_handle = 0;
   *tab_container_window = NULL;
   *tab_window = NULL;
   ExternalTabContainer* external_tab_container =
       new ExternalTabContainer(this, automation_resource_message_filter_);
-  Profile* profile = incognito? profile_->GetOffTheRecordProfile() : profile_;
-  external_tab_container->Init(profile, parent, dimensions, style);
+  Profile* profile = settings.is_off_the_record ?
+      profile_->GetOffTheRecordProfile() : profile_;
+  external_tab_container->Init(profile, settings.parent, settings.dimensions,
+      settings.style, settings.load_requests_via_automation);
   TabContents* tab_contents = external_tab_container->tab_contents();
   if (tab_contents) {
     *tab_handle = tab_tracker_->Add(&tab_contents->controller());
@@ -2422,20 +2419,6 @@ void AutomationProvider::NavigateInExternalTab(
 }
 
 #if defined(OS_WIN)
-// TODO(port): remove windowisms.
-void AutomationProvider::SetAcceleratorsForTab(int handle,
-                                               HACCEL accel_table,
-                                               int accel_entry_count,
-                                               bool* status) {
-  *status = false;
-
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->SetAccelerators(accel_table, accel_entry_count);
-    *status = true;
-  }
-}
-
 void AutomationProvider::ProcessUnhandledAccelerator(
     const IPC::Message& message, int handle, const MSG& msg) {
   ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 8c57e7a..ed23671 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -37,6 +37,7 @@ struct AutomationMsg_Find_Params;
 
 namespace IPC {
 struct Reposition_Params;
+struct ExternalTabSettings;
 }
 
 class LoginHandler;
@@ -289,14 +290,10 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
                             IPC::Message* reply_message);
   void HideInterstitialPage(int tab_handle, bool* success);
 
-// TODO(port): remove windowisms.
-#if defined(OS_WIN)
-  void CreateExternalTab(HWND parent, const gfx::Rect& dimensions,
-                         unsigned int style, bool incognito,
-                         HWND* tab_container_window,
-                         HWND* tab_window,
+  void CreateExternalTab(const IPC::ExternalTabSettings& settings,
+                         gfx::NativeWindow* tab_container_window,
+                         gfx::NativeWindow* tab_window,
                          int* tab_handle);
-#endif  // defined(OS_WIN)
 
   void NavigateInExternalTab(
       int handle, const GURL& url,
@@ -318,12 +315,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
 
 // TODO(port): remove windowisms.
 #if defined(OS_WIN)
-  // This sets the keyboard accelerators to be used by an externally
-  // hosted tab. This call is not valid on a regular tab hosted within
-  // Chrome.
-  void SetAcceleratorsForTab(int handle, HACCEL accel_table,
-                             int accel_entry_count, bool* status);
-
   void OnTabReposition(int tab_handle,
                        const IPC::Reposition_Params& params);
   void OnForwardContextMenuCommandToChrome(int tab_handle, int command);