diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 22:04:15 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 22:04:15 +0000 |
| commit | a5a7eb258c1d2092f671e38a83b8eeb3931e4ed3 (patch) | |
| tree | dda2ba507920cbbc7d80be98e78eed92681cb95e /chrome/test | |
| parent | 6242f020fdcfdba371613270beeb89f5bf606d11 (diff) | |
| download | chromium_src-a5a7eb258c1d2092f671e38a83b8eeb3931e4ed3.zip chromium_src-a5a7eb258c1d2092f671e38a83b8eeb3931e4ed3.tar.gz chromium_src-a5a7eb258c1d2092f671e38a83b8eeb3931e4ed3.tar.bz2 | |
Removes the old frames.
http://crbug.com/2324
Review URL: http://codereview.chromium.org/10265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/accessibility/accessibility_util.cc | 11 | ||||
| -rw-r--r-- | chrome/test/testing_browser_process.h | 2 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 6 |
3 files changed, 3 insertions, 16 deletions
diff --git a/chrome/test/accessibility/accessibility_util.cc b/chrome/test/accessibility/accessibility_util.cc index 782ee0a..36089cd 100644 --- a/chrome/test/accessibility/accessibility_util.cc +++ b/chrome/test/accessibility/accessibility_util.cc @@ -7,8 +7,6 @@ #include "base/win_util.h" #include "chrome/common/win_util.h" #include "chrome/common/l10n_util.h" -#include "chrome/browser/views/old_frames/xp_frame.h" -#include "chrome/browser/views/old_frames/vista_frame.h" #include "chrome/test/accessibility/constants.h" #include "chromium_strings.h" @@ -41,15 +39,6 @@ HWND GetChromeBrowserWnd(IAccessible** ppi_access) { const std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_NAME); EnumWindows(WindowEnumProc, reinterpret_cast<LPARAM>(&hwnd)); - if (!IsWindow(hwnd)) { - // Didn't find the window handle by looking for the new frames, assume the - // old frames are being used instead... - if (win_util::ShouldUseVistaFrame()) { - hwnd = FindWindow(VISTA_FRAME_CLASSNAME, NULL); - } else { - hwnd = FindWindow(XP_FRAME_CLASSNAME, NULL); - } - } if (NULL == hwnd) { if (ppi_access) diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h index 92234a2..3220c05 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -120,8 +120,6 @@ class TestingBrowserProcess : public BrowserProcess { virtual SuspendController* suspend_controller() { return NULL; } - virtual bool IsUsingNewFrames() { return false; } - virtual HANDLE shutdown_event() { return shutdown_event_; } private: diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index 66a103c..0cbabad 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -33,10 +33,10 @@ class TabProxy; class UITest : public testing::Test { protected: // Delay to let browser complete a requested action. - static const int kWaitForActionMsec = 2000; - static const int kWaitForActionMaxMsec = 10000; + static const int kWaitForActionMsec = 1000; + static const int kWaitForActionMaxMsec = 1000; // Delay to let the browser complete the test. - static const int kMaxTestExecutionTime = 30000; + static const int kMaxTestExecutionTime = 3000; // Tries to delete the specified file/directory returning true on success. // This differs from file_util::Delete in that it repeatedly invokes Delete |