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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
6 #include "chrome/browser/tab_first_render_watcher.h" | 6 #include "chrome/browser/tab_first_render_watcher.h" |
7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/views/dom_view.h" | 8 #include "chrome/browser/ui/views/dom_view.h" |
9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
12 #include "views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 | 15 |
16 views::Widget* CreateWindowForContents(views::View* contents) { | 16 views::Widget* CreateWindowForContents(views::View* contents) { |
17 views::Widget::InitParams widget_params( | 17 views::Widget::InitParams widget_params( |
18 views::Widget::InitParams::TYPE_WINDOW); | 18 views::Widget::InitParams::TYPE_WINDOW); |
19 | 19 |
20 views::Widget* widget = new views::Widget; | 20 views::Widget* widget = new views::Widget; |
21 widget->Init(widget_params); | 21 widget->Init(widget_params); |
22 widget->SetContentsView(contents); | 22 widget->SetContentsView(contents); |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 // OnTabMainFrameLoaded() will Quit(). | 79 // OnTabMainFrameLoaded() will Quit(). |
80 MessageLoopForUI::current()->Run(); | 80 MessageLoopForUI::current()->Run(); |
81 EXPECT_TRUE(main_frame_loaded_); | 81 EXPECT_TRUE(main_frame_loaded_); |
82 | 82 |
83 // OnTabMainFrameFirstRender() will Quit(). | 83 // OnTabMainFrameFirstRender() will Quit(). |
84 MessageLoopForUI::current()->Run(); | 84 MessageLoopForUI::current()->Run(); |
85 EXPECT_TRUE(main_frame_rendered_); | 85 EXPECT_TRUE(main_frame_rendered_); |
86 | 86 |
87 dom_view->GetWidget()->Close(); | 87 dom_view->GetWidget()->Close(); |
88 } | 88 } |
OLD | NEW |