diff options
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 7 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index d6cf19b..0de0782 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1535,8 +1535,7 @@ void AutomationProvider::IsWindowActive(int handle, bool* success, } } -void AutomationProvider::ActivateWindow(const IPC::Message& message, - int handle) { +void AutomationProvider::ActivateWindow(int handle) { if (window_tracker_->ContainsHandle(handle)) { ::SetActiveWindow(window_tracker_->GetResource(handle)); } diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 06d7440..a310d8e 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -151,7 +151,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, int flags); void SetWindowVisible(int handle, bool visible, bool* result); void IsWindowActive(int handle, bool* success, bool* is_active); - void ActivateWindow(const IPC::Message& message, int handle); + void ActivateWindow(int handle); void GetTabCount(int handle, int* tab_count); void GetTab(int win_handle, int tab_index, int* tab_handle); diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 45e3aca..ca68034 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -54,7 +54,7 @@ bool ActivateTabByClick(AutomationProxy* automation, } // namespace -TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) { +TEST_F(BrowserFocusTest, BrowsersRememberFocus) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index 06a76cf..b2745b1 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -355,11 +355,12 @@ IPC_BEGIN_MESSAGES(Automation) bool /* active */) // Makes the specified window the active window. - IPC_MESSAGE_ROUTED1(AutomationMsg_ActivateWindow, int /* view_handle */) + IPC_SYNC_MESSAGE_ROUTED1_0(AutomationMsg_ActivateWindow, + int /* view_handle */) // Opens a new browser window. - IPC_MESSAGE_ROUTED1(AutomationMsg_OpenNewBrowserWindow, - int /* show_command*/ ) + IPC_SYNC_MESSAGE_ROUTED1_0(AutomationMsg_OpenNewBrowserWindow, + int /* show_command*/ ) // This message requests the handle (int64 app-unique identifier) of the // current active top window. On error, the returned handle value is 0. |