diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 18:31:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 18:31:48 +0000 |
| commit | b1b4fa531d771bfc627836b8192aed17021614b2 (patch) | |
| tree | bd631da65788ce8a209789c43f472f4a28289d83 /chrome/test/automation | |
| parent | 23055d9c157a96eea2c95de19eb4d6505658dfba (diff) | |
| download | chromium_src-b1b4fa531d771bfc627836b8192aed17021614b2.zip chromium_src-b1b4fa531d771bfc627836b8192aed17021614b2.tar.gz chromium_src-b1b4fa531d771bfc627836b8192aed17021614b2.tar.bz2 | |
Revert "Keyboard accessibility for the page and app menus.", rev 42234 and 42236.
TBR=dmazzoni
Review URL: http://codereview.chromium.org/1158004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 14 | ||||
| -rw-r--r-- | chrome/test/automation/window_proxy.cc | 31 | ||||
| -rw-r--r-- | chrome/test/automation/window_proxy.h | 8 |
3 files changed, 0 insertions, 53 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index b73ef4b..7447020 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -348,14 +348,6 @@ IPC_BEGIN_MESSAGES(Automation) int /* view_handle */, int /* focused_view_id */) - // Block until the focused view id changes to something other than - // |previous_view_id|. - IPC_SYNC_MESSAGE_ROUTED2_2(AutomationMsg_WaitForFocusedViewIDToChange, - int /* window handle */, - int /* previous_view_id */, - bool /* success */, - int /* new_view_id */) - // This message shows/hides the window. IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_SetWindowVisible, int /* view_handle */, @@ -1296,10 +1288,4 @@ IPC_BEGIN_MESSAGES(Automation) int64 /* id */, bool /* success */) - // Determine if a pop-up menu is open. - IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_IsPopUpMenuOpen, - int /* window handle */, - bool /* success */, - bool /* is_open */) - IPC_END_MESSAGES(Automation) diff --git a/chrome/test/automation/window_proxy.cc b/chrome/test/automation/window_proxy.cc index 5f18f6b..295f05b 100644 --- a/chrome/test/automation/window_proxy.cc +++ b/chrome/test/automation/window_proxy.cc @@ -8,7 +8,6 @@ #include <algorithm> #include "base/logging.h" -#include "base/time.h" #include "chrome/test/automation/automation_constants.h" #include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" @@ -17,9 +16,6 @@ #include "gfx/rect.h" #include "googleurl/src/gurl.h" -using base::TimeDelta; -using base::TimeTicks; - bool WindowProxy::SimulateOSClick(const gfx::Point& click, int flags) { if (!is_valid()) return false; @@ -127,14 +123,6 @@ bool WindowProxy::GetFocusedViewID(int* view_id) { view_id)); } -bool WindowProxy::WaitForFocusedViewIDToChange( - int old_view_id, int* new_view_id) { - bool result = false; - sender_->Send(new AutomationMsg_WaitForFocusedViewIDToChange - (0, handle_, old_view_id, &result, new_view_id)); - return result; -} - scoped_refptr<BrowserProxy> WindowProxy::GetBrowser() { return GetBrowserWithTimeout(base::kNoTimeout, NULL); } @@ -175,22 +163,3 @@ bool WindowProxy::IsMaximized(bool* maximized) { &result)); return result; } - -bool WindowProxy::WaitForPopupMenuOpen(uint32 timeout_ms) { - const TimeTicks start = TimeTicks::Now(); - const TimeDelta timeout = TimeDelta::FromMilliseconds(timeout_ms); - while (TimeTicks::Now() - start < timeout) { - PlatformThread::Sleep(automation::kSleepTime); - - bool is_open = false; - bool success = false; - if (!sender_->Send(new AutomationMsg_IsPopUpMenuOpen( - 0, handle_, &success, &is_open))) - return false; - if (!success) - return false; - if (is_open) - return true; - } - return false; -} diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h index be7ed64..3c5deca 100644 --- a/chrome/test/automation/window_proxy.h +++ b/chrome/test/automation/window_proxy.h @@ -90,14 +90,6 @@ class WindowProxy : public AutomationResourceProxy { // was retrieved. bool GetFocusedViewID(int* view_id); - // Waits until the focused view ID changes to something other than - // |old_view_id|. Returns true if the focused view ID did change. - bool WaitForFocusedViewIDToChange(int old_view_id, int* new_view_id); - - // Waits until a pop-up menu is opened. Returns true on success, or false - // if a pop-up menu is not opened within the timeout period. - bool WaitForPopupMenuOpen(uint32 timeout_ms); - // Returns the browser this window corresponds to, or NULL if this window // is not a browser. The caller owns the returned BrowserProxy. scoped_refptr<BrowserProxy> GetBrowser(); |