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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/singleton.h" | 9 #include "base/singleton.h" |
10 #include "chrome/browser/dom_ui/html_dialog_ui.h" | 10 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
11 #include "chrome/browser/tab_contents/tab_contents.h" | 11 #include "chrome/browser/tab_contents/tab_contents.h" |
12 #include "chrome/browser/renderer_host/render_widget_host_view.h" | |
13 #include "chrome/browser/ui/views/html_dialog_view.h" | 12 #include "chrome/browser/ui/views/html_dialog_view.h" |
| 13 #include "chrome/browser/webui/html_dialog_ui.h" |
14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
15 #include "chrome/test/in_process_browser_test.h" | 15 #include "chrome/test/in_process_browser_test.h" |
16 #include "chrome/test/ui_test_utils.h" | 16 #include "chrome/test/ui_test_utils.h" |
| 17 #include "testing/gmock/include/gmock/gmock.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
18 #include "testing/gmock/include/gmock/gmock.h" | |
19 #include "views/widget/widget.h" | 19 #include "views/widget/widget.h" |
20 #include "views/window/window.h" | 20 #include "views/window/window.h" |
21 | 21 |
22 using testing::Eq; | 22 using testing::Eq; |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 // Window non-client-area means that the minimum size for the window | 26 // Window non-client-area means that the minimum size for the window |
27 // won't be the actual minimum size - our layout and resizing code | 27 // won't be the actual minimum size - our layout and resizing code |
28 // makes sure the chrome is always visible. | 28 // makes sure the chrome is always visible. |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 198 |
199 html_view->MoveContents(tab_contents, set_bounds); | 199 html_view->MoveContents(tab_contents, set_bounds); |
200 ui_test_utils::RunMessageLoop(); | 200 ui_test_utils::RunMessageLoop(); |
201 html_view->GetWidget()->GetBounds(&actual_bounds, false); | 201 html_view->GetWidget()->GetBounds(&actual_bounds, false); |
202 EXPECT_LT(0, actual_bounds.width()); | 202 EXPECT_LT(0, actual_bounds.width()); |
203 EXPECT_LT(0, actual_bounds.height()); | 203 EXPECT_LT(0, actual_bounds.height()); |
204 | 204 |
205 MessageLoopForUI::current()->RemoveObserver( | 205 MessageLoopForUI::current()->RemoveObserver( |
206 WindowChangedObserver::GetInstance()); | 206 WindowChangedObserver::GetInstance()); |
207 } | 207 } |
OLD | NEW |