| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include <atlbase.h> | 5 #include <atlbase.h> | 
| 6 #include <atlapp.h> | 6 #include <atlapp.h> | 
| 7 #include <atlcrack.h> | 7 #include <atlcrack.h> | 
| 8 #include <atlmisc.h> | 8 #include <atlmisc.h> | 
| 9 #include <atlwin.h> | 9 #include <atlwin.h> | 
| 10 | 10 | 
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 424 // | 424 // | 
| 425 // [0, infobar_height / 2) | 425 // [0, infobar_height / 2) | 
| 426 // [infobar_height / 2, infobar_height) | 426 // [infobar_height / 2, infobar_height) | 
| 427 // [infobar_height, infobar_height] | 427 // [infobar_height, infobar_height] | 
| 428 // (infobar_height / 2, infobar_height] | 428 // (infobar_height / 2, infobar_height] | 
| 429 // [0, infobar_height / 2] | 429 // [0, infobar_height / 2] | 
| 430 // | 430 // | 
| 431 // If the test turns out to be flaky (i.e., because timers are not firing | 431 // If the test turns out to be flaky (i.e., because timers are not firing | 
| 432 // frequently enough to hit all the ranges), increasing the infobar_height | 432 // frequently enough to hit all the ranges), increasing the infobar_height | 
| 433 // should increase the margin (by increasing the time spent in each range). | 433 // should increase the margin (by increasing the time spent in each range). | 
| 434 // | 434 TEST(InfobarsInfobarWindowTest, SlidingTest) { | 
| 435 // TODO(erikwright): re-enable when sliding is fixed (currently crashes in IE6). |  | 
| 436 TEST(InfobarsInfobarWindowTest, DISABLED_SlidingTest) { |  | 
| 437   int infobar_height = 40; | 435   int infobar_height = 40; | 
| 438 | 436 | 
| 439   chrome_frame_test::TimedMsgLoop message_loop; | 437   chrome_frame_test::TimedMsgLoop message_loop; | 
| 440 | 438 | 
| 441   RECT natural_dimensions = {10, 20, 90, 100 + infobar_height}; | 439   RECT natural_dimensions = {10, 20, 90, 100 + infobar_height}; | 
| 442 | 440 | 
| 443   // Used to verify that the last RECT given to SetDimensions is the same RECT | 441   // Used to verify that the last RECT given to SetDimensions is the same RECT | 
| 444   // reserved by ReserveSpace. | 442   // reserved by ReserveSpace. | 
| 445   RECT current_infobar_dimensions = {0, 0, 0, 0}; | 443   RECT current_infobar_dimensions = {0, 0, 0, 0}; | 
| 446 | 444 | 
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 601 | 599 | 
| 602   message_loop.RunFor(10);  // seconds | 600   message_loop.RunFor(10);  // seconds | 
| 603 | 601 | 
| 604   window.DestroyWindow(); | 602   window.DestroyWindow(); | 
| 605 | 603 | 
| 606   ASSERT_FALSE(message_loop.WasTimedOut()); | 604   ASSERT_FALSE(message_loop.WasTimedOut()); | 
| 607 } | 605 } | 
| 608 | 606 | 
| 609 // TODO(erikwright): Write test for variations on return from default | 607 // TODO(erikwright): Write test for variations on return from default | 
| 610 // OnNcCalcValidRects | 608 // OnNcCalcValidRects | 
| OLD | NEW | 
|---|