diff options
| author | klink@chromium.org <klink@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 00:39:43 +0000 |
|---|---|---|
| committer | klink@chromium.org <klink@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 00:39:43 +0000 |
| commit | bd04abd493a296e9309fca99d23530b3493ddc93 (patch) | |
| tree | c15673ce5084056b6063473a6ef75e9798ebf160 /chrome/test/accessibility/constants.h | |
| parent | ba1100d658069bcc3ed69a736cd45a1f2b81c8f3 (diff) | |
| download | chromium_src-bd04abd493a296e9309fca99d23530b3493ddc93.zip chromium_src-bd04abd493a296e9309fca99d23530b3493ddc93.tar.gz chromium_src-bd04abd493a296e9309fca99d23530b3493ddc93.tar.bz2 | |
Adds some more cleanup and test coverage to the Accessibility tests.
Review URL: http://codereview.chromium.org/15097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/accessibility/constants.h')
| -rw-r--r-- | chrome/test/accessibility/constants.h | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/chrome/test/accessibility/constants.h b/chrome/test/accessibility/constants.h index 5fad4b7..43091795 100644 --- a/chrome/test/accessibility/constants.h +++ b/chrome/test/accessibility/constants.h @@ -8,17 +8,14 @@ #include <windows.h> #include <tchar.h> -#define NEW_FRAMES - /////////////////////////////////////////////////////////////////// -// Constant Definitations specific to Chrome Accessibility Tests. +// Constants definitions specific to Chrome Accessibility Tests. /////////////////////////////////////////////////////////////////// // Safe delete and release operations. #define CHK_RELEASE(obj) { if (obj) { (obj)->Release(); (obj) = NULL; } } #define CHK_DELETE(obj) { if (obj) { delete (obj); (obj) = NULL; } } - // Chrome Accessibility Tests specific strings. #define CHROME_PATH _T("C:\\Program Files\\Google\\Chrome\\Chrome.exe") #define CHROME_VIEWS_TEXT_FIELD_EDIT _T("ChromeViewsTextFieldEdit") @@ -29,50 +26,21 @@ #define AUTH_TITLE _T("Authentication Required - Chrome") #define CHROME_TAB_CONTENTS _T("Chrome_TabContents") +// Index for accessing specific children in the MSAA hierarchy. +// TODO(klink): Remove the need for these. #define CHROME_APP_ACC_INDEX (3) #define CHROME_CLIENT_ACC_INDEX (0) - -// Chrome Client chidren. -#ifdef NEW_FRAMES #define BROWSER_VIEW_ACC_INDEX (4) + +// Chrome Client chidren. These UI elements cannot take MSAA focus, and +// therefore have no ViewID associated. #define TABSTRIP_ACC_INDEX (0) #define CHROME_MIN_ACC_INDEX (0) #define CHROME_MAX_ACC_INDEX (1) #define CHROME_RESTORE_ACC_INDEX (2) #define CHROME_CLOSE_ACC_INDEX (3) -#else -#define BROWSER_VIEW_ACC_INDEX (0) -#define TABSTRIP_ACC_INDEX (1) -#if defined(GOOGLE_CHROME_BUILD) -#define CHROME_MIN_ACC_INDEX (4) -#define CHROME_MAX_ACC_INDEX (5) -#define CHROME_RESTORE_ACC_INDEX (6) -#define CHROME_CLOSE_ACC_INDEX (7) -#else -#define CHROME_MIN_ACC_INDEX (3) -#define CHROME_MAX_ACC_INDEX (4) -#define CHROME_RESTORE_ACC_INDEX (5) -#define CHROME_CLOSE_ACC_INDEX (6) -#endif -#endif - -// Browser View children. -#ifdef NEW_FRAMES -#define TOOLBAR_ACC_INDEX (1) -#else -#define TOOLBAR_ACC_INDEX (0) -#endif - -// Toolbar children. -#define BACK_BTN_INDEX (0) -#define FORWARD_BTN_INDEX (1) -#define RELOAD_BTN_INDEX (2) -#define STAR_BTN_INDEX (4) -#define GO_BTN_INDEX (6) -#define PAGE_BTN_INDEX (7) -#define MENU_BTN_INDEX (8) -// Digit limits for tab index which can be used in accelerator. +// Tab index limits for bounds checking in Accessibility Tests. #define MAX_TAB_INDEX_DIGIT (9) #define MIN_TAB_INDEX_DIGIT (1) |