| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/common/clipboard_service.h" | 7 #include "chrome/common/clipboard_service.h" |
| 8 #include "chrome/common/gfx/chrome_canvas.h" | 8 #include "chrome/common/gfx/chrome_canvas.h" |
| 9 #include "chrome/common/gfx/path.h" | 9 #include "chrome/common/gfx/path.h" |
| 10 #include "chrome/common/notification_service.h" | 10 #include "chrome/common/notification_service.h" |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 virtual void DeleteDelegate() { delete this; } | 767 virtual void DeleteDelegate() { delete this; } |
| 768 | 768 |
| 769 virtual View* GetContentsView() { return contents_; } | 769 virtual View* GetContentsView() { return contents_; } |
| 770 | 770 |
| 771 private: | 771 private: |
| 772 View* contents_; | 772 View* contents_; |
| 773 }; | 773 }; |
| 774 | 774 |
| 775 // Tests that the mouse-wheel messages are correctly rerouted to the window | 775 // Tests that the mouse-wheel messages are correctly rerouted to the window |
| 776 // under the mouse. | 776 // under the mouse. |
| 777 TEST_F(ViewTest, RerouteMouseWheelTest) { | 777 // TODO(jcampan): http://crbug.com/10572 Disabled as it fails on the Vista build |
| 778 // bot. |
| 779 TEST_F(ViewTest, DISABLED_RerouteMouseWheelTest) { |
| 778 TestViewWithControls* view_with_controls = new TestViewWithControls(); | 780 TestViewWithControls* view_with_controls = new TestViewWithControls(); |
| 779 views::Window* window1 = | 781 views::Window* window1 = |
| 780 views::Window::CreateChromeWindow( | 782 views::Window::CreateChromeWindow( |
| 781 NULL, gfx::Rect(0, 0, 100, 100), | 783 NULL, gfx::Rect(0, 0, 100, 100), |
| 782 new SimpleWindowDelegate(view_with_controls)); | 784 new SimpleWindowDelegate(view_with_controls)); |
| 783 window1->Show(); | 785 window1->Show(); |
| 784 ScrollView* scroll_view = new ScrollView(); | 786 ScrollView* scroll_view = new ScrollView(); |
| 785 scroll_view->SetContents(new ScrollableTestView()); | 787 scroll_view->SetContents(new ScrollableTestView()); |
| 786 views::Window* window2 = | 788 views::Window* window2 = |
| 787 views::Window::CreateChromeWindow(NULL, gfx::Rect(200, 200, 100, 100), | 789 views::Window::CreateChromeWindow(NULL, gfx::Rect(200, 200, 100, 100), |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 SimularePressingEnterAndCheckDefaultButton(OK); | 1006 SimularePressingEnterAndCheckDefaultButton(OK); |
| 1005 | 1007 |
| 1006 // Focus the cancel button. | 1008 // Focus the cancel button. |
| 1007 client_view_->FocusWillChange(NULL, cancel_button_); | 1009 client_view_->FocusWillChange(NULL, cancel_button_); |
| 1008 EXPECT_FALSE(ok_button_->is_default()); | 1010 EXPECT_FALSE(ok_button_->is_default()); |
| 1009 EXPECT_TRUE(cancel_button_->is_default()); | 1011 EXPECT_TRUE(cancel_button_->is_default()); |
| 1010 EXPECT_FALSE(dialog_view_->button1_->is_default()); | 1012 EXPECT_FALSE(dialog_view_->button1_->is_default()); |
| 1011 EXPECT_FALSE(dialog_view_->button2_->is_default()); | 1013 EXPECT_FALSE(dialog_view_->button2_->is_default()); |
| 1012 SimularePressingEnterAndCheckDefaultButton(CANCEL); | 1014 SimularePressingEnterAndCheckDefaultButton(CANCEL); |
| 1013 } | 1015 } |
| OLD | NEW |