summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_uitest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-08 20:50:05 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-08 20:50:05 +0000
commitf1d306e67b8676336f55aae95652d7cd51359534 (patch)
tree6f25205e78ba4c69e7b45468b3fdd0f6bed259f5 /chrome/browser/browser_uitest.cc
parentb3d565264e6073bd00e4dfd81c8f887ea01fb58c (diff)
downloadchromium_src-f1d306e67b8676336f55aae95652d7cd51359534.zip
chromium_src-f1d306e67b8676336f55aae95652d7cd51359534.tar.gz
chromium_src-f1d306e67b8676336f55aae95652d7cd51359534.tar.bz2
Cleanup, part 1.
* Consistently use underscores between words in identifiers (IDC_NEWTAB -> IDC_NEW_TAB) * Make some identifiers clearer or more up-to-date (IDC_DUPLICATE -> IDC_DUPLICATE_TAB, IDC_GOOFFTHERECORD -> IDC_NEW_INCOGNITO_WINDOW, IDC_NEWPROFILEWINDOW -> IDC_PROFILE_MENU) * Try and make string identifiers (IDS_xxx) match their corresponding IDC_xxx commands. Tony tells me this will not cause any need for retranslation. * As much as possible (without modifying automated UI test XML files), use "Bookmark Bar", not "Bookmarks Bar" (this seemed to be prevailing usage in the code) * Fix 80-column issues This patch touches move files than any subsequent patches, but should be the most rubber-stampable. Review URL: http://codereview.chromium.org/13633 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_uitest.cc')
-rw-r--r--chrome/browser/browser_uitest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index f3e42e3..d849860 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -180,11 +180,11 @@ TEST_F(BrowserTest, TabNavigationAccelerators) {
// to.
int old_tab_count = -1;
ASSERT_TRUE(window->GetTabCount(&old_tab_count));
- ASSERT_TRUE(window->ApplyAccelerator(IDC_NEWTAB));
+ ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
int new_tab_count;
ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
5000));
- ASSERT_TRUE(window->ApplyAccelerator(IDC_NEWTAB));
+ ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
old_tab_count = new_tab_count;
ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
5000));
@@ -202,7 +202,7 @@ TEST_F(BrowserTest, TabNavigationAccelerators) {
ASSERT_TRUE(window->WaitForTabToBecomeActive(1, 5000));
// Navigate back to the first tab using the previous accelerators.
- ASSERT_TRUE(window->ApplyAccelerator(IDC_SELECT_PREV_TAB));
+ ASSERT_TRUE(window->ApplyAccelerator(IDC_SELECT_PREVIOUS_TAB));
ASSERT_TRUE(window->WaitForTabToBecomeActive(0, 5000));
// Navigate to the last tab using the select last accelerator.
@@ -248,7 +248,7 @@ TEST_F(BrowserTest, DuplicateTab) {
ASSERT_TRUE(automation()->GetBrowserWindowCount(&initial_window_count));
// Duplicate the tab.
- ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_DUPLICATE));
+ ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_DUPLICATE_TAB));
// The duplicated tab should not end up in a new window.
int window_count;