| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/views/web_dialog_view.h" | 12 #include "chrome/browser/ui/views/web_dialog_view.h" |
| 13 #include "chrome/browser/ui/webui/test_web_dialog_delegate.h" | 13 #include "chrome/browser/ui/webui/test_web_dialog_delegate.h" |
| 14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
| 16 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
| 17 #include "content/public/browser/render_widget_host_view.h" | 17 #include "content/public/browser/render_widget_host_view.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "content/public/browser/web_contents_view.h" | 19 #include "content/public/browser/web_contents_view.h" |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
| 23 | 23 |
| 24 using content::WebContents; | 24 using content::WebContents; |
| 25 using testing::Eq; | 25 using testing::Eq; |
| 26 using ui::WebDialogDelegate; |
| 26 | 27 |
| 27 namespace { | 28 namespace { |
| 28 | 29 |
| 29 // Initial size of WebDialog for SizeWindow test case. | 30 // Initial size of WebDialog for SizeWindow test case. |
| 30 const int kInitialWidth = 40; | 31 const int kInitialWidth = 40; |
| 31 const int kInitialHeight = 40; | 32 const int kInitialHeight = 40; |
| 32 | 33 |
| 33 class TestWebDialogView : public WebDialogView { | 34 class TestWebDialogView : public WebDialogView { |
| 34 public: | 35 public: |
| 35 TestWebDialogView(Profile* profile, | 36 TestWebDialogView(Profile* profile, |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 view->InitDialog(); | 201 view->InitDialog(); |
| 201 view->GetWidget()->Show(); | 202 view->GetWidget()->Show(); |
| 202 | 203 |
| 203 // TestWebDialogView::OnTabMainFrameRender() will Quit(). | 204 // TestWebDialogView::OnTabMainFrameRender() will Quit(). |
| 204 MessageLoopForUI::current()->Run(); | 205 MessageLoopForUI::current()->Run(); |
| 205 | 206 |
| 206 EXPECT_TRUE(view->painted()); | 207 EXPECT_TRUE(view->painted()); |
| 207 | 208 |
| 208 view->GetWidget()->Close(); | 209 view->GetWidget()->Close(); |
| 209 } | 210 } |
| OLD | NEW |