diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 20:50:05 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 20:50:05 +0000 |
| commit | f1d306e67b8676336f55aae95652d7cd51359534 (patch) | |
| tree | 6f25205e78ba4c69e7b45468b3fdd0f6bed259f5 /chrome/browser/sessions/session_restore_uitest.cc | |
| parent | b3d565264e6073bd00e4dfd81c8f887ea01fb58c (diff) | |
| download | chromium_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/sessions/session_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index f93098a..8843567 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -47,7 +47,7 @@ class SessionRestoreUITest : public UITest { scoped_ptr<BrowserProxy> browser_proxy( automation()->GetBrowserWindow(window_index)); ASSERT_TRUE(browser_proxy.get()); - ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSEWINDOW)); + ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSE_WINDOW)); browser_proxy.reset(); int window_count; ASSERT_TRUE(automation()->WaitForWindowCountToChange(initial_count, @@ -266,7 +266,7 @@ TEST_F(SessionRestoreUITest, DISABLED_DontRestoreWhileIncognito) { scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); // Create an off the record window and wait for it to appear. - ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_GOOFFTHERECORD)); + ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_INCOGNITO_WINDOW)); int window_count; ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count, kWaitForActionMsec) && @@ -389,7 +389,7 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) { // Create two new tabs. int new_tab_count; - ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEWTAB)); + ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB)); ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count, kWaitForActionMsec)); scoped_ptr<TabProxy> last_tab(browser_proxy->GetTab(new_tab_count - 1)); @@ -397,7 +397,7 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) { // Do a reload to ensure new tab page has loaded. ASSERT_TRUE(last_tab->Reload()); tab_count = new_tab_count; - ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEWTAB)); + ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB)); ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count, kWaitForActionMsec)); last_tab.reset(browser_proxy->GetTab(new_tab_count - 1)); |