summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 20:44:56 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 20:44:56 +0000
commitc242ced5b31013647094b646322149dde45460c8 (patch)
tree72657ddb4645b86a7edbe45b49a05ef7f820c134 /chrome
parentda9ebf7fd186dac398803517345f5278cb884502 (diff)
downloadchromium_src-c242ced5b31013647094b646322149dde45460c8.zip
chromium_src-c242ced5b31013647094b646322149dde45460c8.tar.gz
chromium_src-c242ced5b31013647094b646322149dde45460c8.tar.bz2
Update special_tabs.py to match newer strings for the Settings window.
TBR=yoz BUG=109939 Review URL: https://chromiumcodereview.appspot.com/9233034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/test/functional/special_tabs.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/chrome/test/functional/special_tabs.py b/chrome/test/functional/special_tabs.py
index 159d0a9..9a61a56 100755
--- a/chrome/test/functional/special_tabs.py
+++ b/chrome/test/functional/special_tabs.py
@@ -18,13 +18,9 @@ class SpecialTabsTest(pyauto.PyUITest):
"""Get a dict of accelerators and corresponding tab titles."""
ret = {
pyauto.IDC_SHOW_HISTORY: 'History',
- pyauto.IDC_MANAGE_EXTENSIONS: 'Preferences - Extensions',
+ pyauto.IDC_MANAGE_EXTENSIONS: 'Settings - Extensions',
pyauto.IDC_SHOW_DOWNLOADS: 'Downloads',
}
- if pyauto.PyUITest.IsWin():
- ret[pyauto.IDC_MANAGE_EXTENSIONS] = 'Options - Extensions'
- elif pyauto.PyUITest.IsChromeOS():
- ret[pyauto.IDC_MANAGE_EXTENSIONS] = 'Settings - Extensions'
return ret
special_url_redirects = {
@@ -51,7 +47,7 @@ class SpecialTabsTest(pyauto.PyUITest):
'chrome://credits': { 'title': 'Credits', 'CSP': False },
'chrome://downloads': { 'title': 'Downloads' },
'chrome://dns': { 'title': 'About DNS' },
- 'chrome://settings/extensions': { 'title': 'Preferences - Extensions' },
+ 'chrome://settings/extensions': { 'title': 'Settings - Extensions' },
'chrome://flags': {},
'chrome://flash': {},
'chrome://gpu-internals': {},
@@ -64,7 +60,7 @@ class SpecialTabsTest(pyauto.PyUITest):
'chrome://newtab': { 'title': 'New Tab', 'CSP': False },
'chrome://plugins': { 'title': 'Plug-ins' },
'chrome://sessions': { 'title': 'Sessions' },
- 'chrome://settings': { 'title': 'Preferences - Basics' },
+ 'chrome://settings': { 'title': 'Settings - Basics' },
'chrome://stats': {},
'chrome://sync': { 'title': 'Sync Internals' },
'chrome://sync-internals': { 'title': 'Sync Internals' },
@@ -158,10 +154,6 @@ class SpecialTabsTest(pyauto.PyUITest):
win_special_url_tabs = {
'chrome://conflicts': {},
-
- # OVERRIDE - different title for page.
- 'chrome://settings': { 'title': 'Options - Basics' },
- 'chrome://settings/extensions': { 'title': 'Options - Extensions' },
}
broken_win_special_url_tabs = {
# Sync on windows badly broken at the moment.