Reverting 9388.

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "chrome/app/chrome_dll_resource.h" 
@@ skipping 752 matching lines @@
     IPC_MESSAGE_HANDLER(AutomationMsg_NavigateInExternalTabRequest,
                         NavigateInExternalTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ShowInterstitialPageRequest,
                         ShowInterstitialPage);
     IPC_MESSAGE_HANDLER(AutomationMsg_HideInterstitialPageRequest,
                         HideInterstitialPage);
     IPC_MESSAGE_HANDLER(AutomationMsg_SetAcceleratorsForTab,
                         SetAcceleratorsForTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator,
                         ProcessUnhandledAccelerator)
-    IPC_MESSAGE_HANDLER(AutomationMsg_SetInitialFocus,
-                        SetInitialFocus)
     IPC_MESSAGE_HANDLER(AutomationMsg_WaitForTabToBeRestored,
                         WaitForTabToBeRestored)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetSecurityState,
                         GetSecurityState)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetPageType,
                         GetPageType)
     IPC_MESSAGE_HANDLER(AutomationMsg_ActionOnSSLBlockingPage,
                         ActionOnSSLBlockingPage)
     IPC_MESSAGE_HANDLER(AutomationMsg_BringBrowserToFront, BringBrowserToFront)
     IPC_MESSAGE_HANDLER(AutomationMsg_IsPageMenuCommandEnabled,
@@ skipping 1315 matching lines @@
 
   Send(new AutomationMsg_NavigateInExternalTabResponse(message.routing_id(),
                                                        rv));
 }
 
 void AutomationProvider::SetAcceleratorsForTab(const IPC::Message& message,
                                                int handle,
                                                HACCEL accel_table,
                                                int accel_entry_count) {
   bool status = false;
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->SetAccelerators(accel_table, accel_entry_count);
-    status = true;
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
+    ExternalTabContainer* external_tab_container =
+        ExternalTabContainer::GetContainerForTab(
+            tab_contents->GetContainerHWND());
+    // This call is only valid on an externally hosted tab
+    if (external_tab_container) {
+      external_tab_container->SetAccelerators(accel_table,
+                                              accel_entry_count);
+      status = true;
+    }
   }
   Send(new AutomationMsg_SetAcceleratorsForTabResponse(message.routing_id(),
                                                        status));
 }
 
 void AutomationProvider::ProcessUnhandledAccelerator(
     const IPC::Message& message, int handle, const MSG& msg) {
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->ProcessUnhandledAccelerator(msg);
-  }
-  // This message expects no response.
-}
-
-void AutomationProvider::SetInitialFocus(const IPC::Message& message,
-                                           int handle, bool reverse) {
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->SetInitialFocus(reverse);
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
+    ExternalTabContainer* external_tab_container =
+        ExternalTabContainer::GetContainerForTab(
+            tab_contents->GetContainerHWND());
+    // This call is only valid on an externally hosted tab
+    if (external_tab_container) {
+      external_tab_container->ProcessUnhandledAccelerator(msg);
+    }
   }
   // This message expects no response.
 }
 
 void AutomationProvider::WaitForTabToBeRestored(
     const IPC::Message& message,
     int tab_handle) {
   if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* tab = tab_tracker_->GetResource(tab_handle);
     restore_tracker_.reset(
@@ skipping 237 matching lines @@
     TabContents* tab_contents = nav_controller->active_contents();
     if (tab_contents && tab_contents->type() == TAB_CONTENTS_WEB) {
       web_contents = tab_contents->AsWebContents();
       if (tab)
         *tab = nav_controller;
     }
   }
   return web_contents;
 }
 
-ExternalTabContainer* AutomationProvider::GetExternalTabForHandle(int handle) {
-  if (tab_tracker_->ContainsHandle(handle)) {
-    NavigationController* tab = tab_tracker_->GetResource(handle);
-    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
-    DCHECK(tab_contents);
-    if (tab_contents) {
-      HWND hwnd = tab_contents->GetContainerHWND();
-      return ExternalTabContainer::GetContainerForTab(hwnd);
-    }
-  }
-
-  return NULL;
-}
-
 TestingAutomationProvider::TestingAutomationProvider(Profile* profile)
     : AutomationProvider(profile) {
   BrowserList::AddObserver(this);
   NotificationService::current()->AddObserver(
       this,
       NotificationType::SESSION_END,
       NotificationService::AllSources());
 }
 
 TestingAutomationProvider::~TestingAutomationProvider() {
@@ skipping 202 matching lines @@
     }
   }
   Send(new AutomationMsg_OverrideEncodingResponse(message.routing_id(),
                                                   succeed));
 }
 
 void AutomationProvider::SavePackageShouldPromptUser(
     const IPC::Message& message, bool should_prompt) {
   SavePackage::SetShouldPromptUser(should_prompt);
 }