| 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/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" | 14 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" |
| 15 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 16 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | |
| 18 #include "content/public/browser/browser_context.h" | 17 #include "content/public/browser/browser_context.h" |
| 19 #include "content/public/browser/render_widget_host_view.h" | 18 #include "content/public/browser/render_widget_host_view.h" |
| 20 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 20 #include "content/public/test/test_utils.h" |
| 21 #include "testing/gmock/include/gmock/gmock.h" | 21 #include "testing/gmock/include/gmock/gmock.h" |
| 22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
| 23 #include "ui/views/controls/webview/web_dialog_view.h" | 23 #include "ui/views/controls/webview/web_dialog_view.h" |
| 24 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
| 25 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" | 25 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" |
| 26 | 26 |
| 27 using content::BrowserContext; | 27 using content::BrowserContext; |
| 28 using content::WebContents; | 28 using content::WebContents; |
| 29 using testing::Eq; | 29 using testing::Eq; |
| 30 using ui::WebDialogDelegate; | 30 using ui::WebDialogDelegate; |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 EXPECT_EQ(min_size, actual_bounds.size()); | 181 EXPECT_EQ(min_size, actual_bounds.size()); |
| 182 | 182 |
| 183 // And that the render view is also non-zero. | 183 // And that the render view is also non-zero. |
| 184 rwhv_bounds = | 184 rwhv_bounds = |
| 185 view->web_contents()->GetRenderWidgetHostView()->GetViewBounds(); | 185 view->web_contents()->GetRenderWidgetHostView()->GetViewBounds(); |
| 186 EXPECT_LT(0, rwhv_bounds.width()); | 186 EXPECT_LT(0, rwhv_bounds.width()); |
| 187 EXPECT_LT(0, rwhv_bounds.height()); | 187 EXPECT_LT(0, rwhv_bounds.height()); |
| 188 | 188 |
| 189 view->GetWidget()->CloseNow(); | 189 view->GetWidget()->CloseNow(); |
| 190 } | 190 } |
| OLD | NEW |