diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 14:24:28 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 14:24:28 +0000 |
| commit | c9d8cb0caee50c1804b75c518017f249393d841e (patch) | |
| tree | cf0350fbd1da3c1b2fc6fd4c7409babaf005ef14 /chrome_frame/infobars | |
| parent | a3870876170922aa64895be3b73a63db32a3ee2f (diff) | |
| download | chromium_src-c9d8cb0caee50c1804b75c518017f249393d841e.zip chromium_src-c9d8cb0caee50c1804b75c518017f249393d841e.tar.gz chromium_src-c9d8cb0caee50c1804b75c518017f249393d841e.tar.bz2 | |
Fix and re-enable slide-in/slide-out of infobars.
BUG=None
TEST=chrome_frame_unittests --gtest_filter=InfobarsInfobarWindowTest.SlidingTest
Review URL: http://codereview.chromium.org/6231006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/infobars')
| -rw-r--r-- | chrome_frame/infobars/internal/infobar_window.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome_frame/infobars/internal/infobar_window.cc b/chrome_frame/infobars/internal/infobar_window.cc index c2964f1..34b2c3d 100644 --- a/chrome_frame/infobars/internal/infobar_window.cc +++ b/chrome_frame/infobars/internal/infobar_window.cc @@ -22,7 +22,9 @@ const int kInfobarSlideCloseStep = 6; } // namespace -void OnSliderTimer(InfobarWindow::Host* host) { +VOID CALLBACK OnSliderTimer(InfobarWindow::Host* host, + HWND /*hwnd*/, UINT /*uMsg*/, + UINT_PTR /*idEvent*/, DWORD /*dwTime*/) { if (host) host->UpdateLayout(); } @@ -139,8 +141,6 @@ void InfobarWindow::StartSlidingTowards(int target_height) { } bool InfobarWindow::StartTimer() { - return false; // TODO(erikwright): Diagnose and fix crashes on IE. -#if 0 if (timer_id_ != 0) return true; @@ -156,7 +156,6 @@ bool InfobarWindow::StartTimer() { DPLOG_IF(ERROR, timer_id_ == 0) << "Failure in SetTimer."; return timer_id_ != 0; -#endif } bool InfobarWindow::StopTimer() { |